Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
.settings	update runtime to 2.0	2015-02-27 14:49:04 +08:00
frameworks	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
res	update lua-default-template	2014-12-29 05:51:49 +08:00
src	add Cocos Studio support	2014-12-29 13:41:21 +08:00
.project	update lua default template	2015-01-09 13:21:19 +08:00
cocos-project-template.json	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
config.json	Modify default console and upload port for lua runtime	2015-04-21 23:07:19 +08:00