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
..
ArmatureTest	1. update Samples on develop branch.	2013-09-10 09:53:15 +08:00
CocoStudioArmatureTest	change singleton class get method to getInstance	2013-09-16 15:16:05 +08:00
CocoStudioComponentsTest	[Dispatcher] New event dispatcher, first commit.	2013-09-11 22:09:34 +08:00
CocoStudioSceneTest	1.remove CC from class name	2013-09-15 19:08:45 +08:00
CocosBuilderTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
ControlExtensionTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
EditBoxTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
NetworkTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
NotificationCenterTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
Scale9SpriteTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
TableViewTest	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
ExtensionsTest.cpp	[Dispatcher] New event dispatcher, first commit.	2013-09-11 22:09:34 +08:00
ExtensionsTest.h	[Dispatcher] New event dispatcher, first commit.	2013-09-11 22:09:34 +08:00