samuele3hu 8d9064b4e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test ... Conflicts: tests/cpp-tests/Classes/AppDelegate.cpp		2015-04-22 10:31:39 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test	2015-04-22 10:31:39 +08:00
Resources	Merge pull request #11430 from minggo/update-spine	2015-04-14 17:01:11 +08:00
proj.android	merge cocos	2015-03-30 10:28:14 +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	disable INCREMENTAL for ARM builds. Fixes lnk2013 error	2015-04-21 08:50:43 -07:00
proj.win32	merge cocos	2015-03-30 10:28:14 +08:00
.cocos-project.json	Support compile & run test projects with cocos2d-console on wp8.	2015-03-25 11:42:55 +08:00
CMakeLists.txt	add to linux	2015-04-02 16:57:38 +08:00