chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/cocos-project-template.json		2014-06-23 17:30:33 +08:00
..
frameworks/runtime-src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
res	move runtime res path	2014-05-22 22:08:04 +08:00
runtime	modify runtime folder	2014-05-30 11:00:26 +08:00
src	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
.project	move win menu bar to sysmenu	2014-05-06 17:03:40 +08:00
cocos-project-template.json	Modify the lua runtime template for prebuilt engine.	2014-06-19 11:33:39 +08:00
config.json	modify android orientation	2014-05-14 14:40:27 +08:00