kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp		2014-12-04 15:32:25 +08:00
..
AssetsManagerExTest	change asset manager to use a new resource, which will not affect other test cases	2014-10-20 11:03:13 +08:00
CocoStudioActionTimelineTest	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-04 15:32:25 +08:00
CocoStudioArmatureTest	scheduler and macro fixes	2014-10-03 09:38:36 -07:00
CocoStudioComponentsTest	changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist	2014-09-23 10:39:17 -07:00
CocoStudioSceneTest	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
CocosBuilderTest	Adds `std::nothrow` to `new`	2014-08-27 16:31:57 -07:00
ControlExtensionTest	test extension::Scale9Sprite and remove unused file compile flags	2014-09-03 15:00:09 +08:00
NetworkTest	Merge pull request #7900 from minggo/setposition-optimize	2014-08-28 14:31:54 +08:00
NotificationCenterTest	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
TableViewTest	Adds `std::nothrow` to `new`	2014-08-27 16:31:57 -07:00
ExtensionsTest.cpp	enabled networking tests for winrt	2014-10-16 11:14:18 -07:00
ExtensionsTest.h	Squashed commit of the following:	2014-05-14 10:07:09 -07:00