andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08:00
..
Classes	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
Resources	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
proj.android	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
proj.android-studio	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.win8.1-universal	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
proj.win10	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
proj.win32	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00