Skip to content

remove platform related code#4913

Merged
jareguo merged 1 commit intococos:v2.2.0from
PPpro:2.2_gl
Jul 18, 2019
Merged

remove platform related code#4913
jareguo merged 1 commit intococos:v2.2.0from
PPpro:2.2_gl

Conversation

@PPpro
Copy link
Copy Markdown
Contributor

@PPpro PPpro commented Jul 18, 2019

@PPpro PPpro changed the base branch from master to v2.2.0 July 18, 2019 10:54
@PPpro PPpro changed the title move platform related code remove platform related code Jul 18, 2019
@jareguo jareguo merged commit 879f329 into cocos:v2.2.0 Jul 18, 2019
jareguo added a commit that referenced this pull request Jul 23, 2019
* v2.2.0:
  fixed api link error. (#4920)
  support alipay minigame (#4880)
  fixed api docs (#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (#4910)
  remove warning when upgrading editBox compnent (#4916)
  move platform related code (#4913)
  fix warn after subContextView modules are excluded (#4737)
  refine code (#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/utils/profiler/CCProfiler.js
@PPpro PPpro deleted the 2.2_gl branch August 7, 2020 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants