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
..
.settings	modify version num	2014-07-12 14:50:23 +08:00
frameworks/runtime-src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-08-28 10:28:31 +08:00
res	move runtime res path	2014-05-22 22:08:04 +08:00
runtime	1.3.1	2014-07-17 09:30:56 -07:00
src	Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates	2014-08-04 17:11:57 +08:00
.project	version.json	2014-07-03 19:56:21 -07:00
cocos-project-template.json	Make lua-template-default support all modules	2014-08-14 21:27:02 +08:00
config.json	add config window top support	2014-07-24 10:30:39 +08:00