axmol/template
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
..
multi-platform-cpp support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00
multi-platform-js Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 20:28:51 +08:00
multi-platform-lua support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00