WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 ... Conflicts: AUTHORS		2015-07-09 11:11:34 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8	2015-07-09 11:11:34 +08:00
Resources	Update the resource sub module reference	2015-07-01 18:44:59 +09:00
proj.android	Add new cpp files into Android.mk	2015-06-30 18:50:13 +09:00
proj.android-studio	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09: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	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09:00
proj.win10	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09:00
proj.win32	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09:00