Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
project	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
res	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
src	Update the Xcode project setting for related test cases	2014-10-15 11:18:22 +08:00
.cocos-project.json	Add files & configuration for android studio support in console.	2015-05-21 16:34:03 +08:00