James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h		2013-09-16 18:18:23 +08:00
..
Images	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
armature	fix armature hd crash	2013-09-14 23:31:33 +08:00
ccb	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
extensions	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
fonts	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
scenetest	1. update scenetest version.	2013-09-14 20:49:02 +08:00
spine	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +08:00