axmol/template/multi-platform-lua
samuele3hu ac46932c06 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
Conflicts:
	tools/project-creator/module/cocos_files.json
2014-01-06 20:07:39 +08:00
..
Classes Modify AppDelegate.cpp file of multi-platform-lua 2013-09-17 21:01:43 +08:00
Resources issue #2433:Modify template/multi_platform_lua/Resources/hello.lua 2013-08-30 17:18:47 +08:00
proj.android Fix:Resolve the lua android template errors 2014-01-06 19:59:31 +08:00
proj.ios_mac test template lua 2014-01-06 14:24:33 +08:00
proj.linux test template lua 2014-01-06 14:24:33 +08:00
proj.win32 test template lua 2014-01-06 14:24:33 +08:00
CMakeLists.txt Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-30 14:51:51 +08:00