samuele3hu c52132179a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix		2014-05-28 10:05:41 +08:00
..
frameworks/runtime-src	Merge pull request #6911 from cocoscodeide/v3	2014-05-27 18:43:10 +08:00
res	move runtime res path	2014-05-22 22:08:04 +08:00
runtime	fixed win no log	2014-05-27 18:21:54 +08:00
src	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:04:29 +08:00
.project	move win menu bar to sysmenu	2014-05-06 17:03:40 +08:00
cocos-project-template.json	runtime 1.1.2	2014-05-23 18:26:36 +08:00
config.json	modify android orientation	2014-05-14 14:40:27 +08:00