yanli.huang
|
9f916841fe
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
|
2016-07-21 16:11:50 +08:00 |
|