Skip to content

Conversation

CocosRobot
Copy link
Contributor

No description provided.

@minggo minggo merged commit f75172b into cocos2d:v3 Feb 24, 2018
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Mar 1, 2018
STEVE: merged with some of my changes

* commit 'f75172b42b6b4486352e5d51eade779f641c7c1a':
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18687)
  Support Belarusian language (cocos2d#18658)
  Fix warning for converting int to float (cocos2d#18672)
  V3 android cmake support, add mac/ios support (cocos2d#18646)

# Conflicts:
#	.gitignore
#	cocos/editor-support/spine/CMakeLists.txt
#	cocos/platform/android/CCApplication-android.cpp
#	cocos/platform/android/libcocos2dx/build.gradle
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