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
..
AssetsManagerTest	issue #2800:Can not hide status bar on iOS 7	2013-09-13 15:54:58 +08:00
HelloCpp	issue #2087: [dispatcher] Reverts: HelloCpp.	2013-09-16 16:22:22 +08:00
SimpleGame	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase	2013-09-13 19:06:09 +08:00
TestCpp	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop	2013-09-16 18:18:23 +08:00