Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
frameworks/runtime-src	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
res	…
src	…
CMakeLists.txt	Solve the error in js template.	2015-04-20 18:09:39 +08:00
cocos-project-template.json	Support build & run Android Studio project in console.	2015-05-25 16:53:36 +08:00
index.html	…
main.js	…
manifest.webapp	…
project.json	Remove the cocos2d-html5 when creating js project by cocos new.	2015-05-19 14:55:04 +08:00