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

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically #18102

Merged
merged 1 commit into from Jul 26, 2017

Conversation

CocosRobot
Copy link
Contributor

No description provided.

@minggo minggo merged commit db79a5e into cocos2d:v3 Jul 26, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jul 31, 2017
* commit '4be6eb532567f747ec2ad62e84893123e236e9f4':
  correct usage of reference count of LabelAtlas (cocos2d#18117)
  correct windows ci build status (cocos2d#18111)
  Update submodule: cocos2d-console (cocos2d#18103)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18097)
  fix crash because of error offset (cocos2d#18108)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18102)
  Fix pageview iterator invalidation (cocos2d#18091)
  make RichText supports img tag with Sprite Frame name (cocos2d#18087)
  Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. (cocos2d#18085)

# Conflicts:
#	tools/cocos2d-console
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.

None yet

2 participants