yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug		2015-12-02 11:26:05 +08:00
..
project	[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0	2015-08-18 22:37:00 +08:00
res/cocosbuilderRes	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
src	resolve conflict and fix checktexture bug	2015-12-02 11:26:05 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00