yangxiao c3ac446f35 resolve conflict		2015-09-07 14:45:09 +08:00
..
Classes	resolve conflict	2015-09-07 14:45:09 +08:00
Resources	resolve conflict	2015-09-07 14:45:09 +08:00
proj.android	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.android-studio	Merge pull request #13467 from fusijie/fix_testcase_as_compile_downloaderTest	2015-08-19 15:17:59 +08:00
proj.ios	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.linux	…
proj.mac	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.win8.1-universal	update c++ debug info settings	2015-08-20 13:25:17 -07:00
proj.win10	update c++ debug info settings	2015-08-20 13:25:17 -07:00
proj.win32	updates to pass Windows App Certification tests	2015-08-18 11:06:47 -07:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	Squashed commit of the following:	2015-08-13 00:14:10 -07:00