chuanweizhang2013 688ad1b3b9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm		2014-08-28 10:28:31 +08:00
..
cpp-template-default	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +08:00
lua-template-default	Update android.mk of cocos and lua-templates	2014-08-27 10:28:04 +08:00
lua-template-runtime	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-08-28 10:28:31 +08:00
cocos2dx_files.json	[AUTO][ci skip]: updating cocos2dx_files.json	2014-08-27 05:40:25 +00:00