Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 ... # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-06-17 13:04:24 +08:00
..
Classes	Merge remote-tracking branch 'origin' into fix_spritepolygon	2015-06-16 11:19:20 +08:00
Resources	Merge pull request #12102 from super626/navigation2	2015-06-15 13:39:05 +08:00
proj.android	revert some accidental changes	2015-06-09 14:06:11 +08:00
proj.android-studio	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +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 cocos	2015-06-11 15:54:42 +08:00
proj.win10	added librecast. Updated build properties	2015-06-15 18:44:14 -07:00
proj.win32	add 3d navigation	2015-05-29 16:45:33 +08:00
.cocos-project.json	Add files & configuration for android studio support in console.	2015-05-21 16:34:03 +08:00
CMakeLists.txt	add 3d navigation	2015-05-29 16:45:33 +08:00