Commit Graph

9 Commits

Author SHA1 Message Date
2youyouo2 034aa113cf fixed mac templates 2016-08-03 14:11:15 +08:00
2youyouo2 b90fa73948 upload missed files 2016-07-27 16:26:10 +08:00
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
minggo 73e93fddc1 fix compiling error with Xcode7.3 caused by libpng 2016-07-18 17:55:21 +08:00
yanli.huang 0aaab3fa5e add anysdk to templates 2016-07-13 16:37:07 +08:00
2youyouo2 259fc314a1 remove runtime files from binary template 2016-07-13 15:11:09 +08:00
zilongshanren 0733fe707c fix template settings 2016-06-12 18:30:04 +08:00
2youyouo2 9982849850 fixed binary template 2016-05-06 13:16:51 +08:00
2youyouo2 e64e5e0178 add binary template 2016-04-13 17:14:11 +08:00