geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h		2015-07-24 11:38:09 +08:00
..
AssetsManagerExTest	more fixes with the namespaces	2015-04-08 21:23:47 -07:00
CocoStudioActionTimelineTest	Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1	2015-07-24 11:38:09 +08:00
CocoStudioArmatureTest	Fix the cocos3.6beta0 bugs	2015-04-22 10:20:21 +08:00
CocoStudioComponentsTest	1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.	2015-06-04 14:06:31 +08:00
CocoStudioSceneTest	fix rapidjson assert error	2015-06-23 13:54:11 +08:00
CocosBuilderTest	tests compiles on xcode 6.3	2015-04-08 17:37:30 -07:00
ControlExtensionTest	more fixes with the namespaces	2015-04-08 21:23:47 -07:00
NetworkTest	tests compiles on xcode 6.3	2015-04-08 17:37:30 -07:00
NotificationCenterTest	Make all test cases work fine with new test framework.	2015-04-03 14:31:03 +08:00
TableViewTest	Make all test cases work fine with new test framework.	2015-04-03 14:31:03 +08:00
ExtensionsTest.cpp	fixed test for Windows 10 CC_PLATFORM_WINRT	2015-05-29 09:35:53 -07:00
ExtensionsTest.h	Make all test cases work fine with new test framework.	2015-04-03 14:31:03 +08:00