Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add JKW_GAME platform #4494

Merged
merged 2 commits into from May 23, 2019

Conversation

Projects
None yet
2 participants
@knoxHuang
Copy link
Collaborator

commented May 23, 2019

Re: cocos-creator/2d-tasks#1456

Changes:

  • CCSys 加入 JKW_GAME 标记

knoxHuang added some commits May 23, 2019

@jareguo jareguo merged commit 1a47720 into cocos-creator:v2.0.10-release May 23, 2019

1 check was pending

ci/circleci: test CircleCI is running your tests
Details

jareguo added a commit that referenced this pull request May 26, 2019

Merge commit v2.0.10 into v2.1.2
* commit 'b4026ac481b9d88c02cd463f2504afbc5c5c0581':
  Fix spine cache error (#4503)
  check native bind
  Modify the reference to EventManager. (#4498)
  fix IE exception when output log/warn before engine initialization
  Fix opacity cascading issues of labelOutLine. (#4495)
  add JKW_GAME platform (#4494)

# Conflicts:
#	cocos2d/core/renderer/utils/label/ttf.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.