samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/platform/CCFileUtils.cpp tests/lua-tests/project/CMakeLists.txt tests/lua-tests/project/Classes/AppDelegate.cpp tests/lua-tests/project/proj.android/jni/Android.mk tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj		2014-10-15 13:41:27 +08:00
..
AssetsManagerExTest	no message	2014-10-09 18:30:39 +08:00
CocoStudioActionTimelineTest	Add protocolbuf.a	2014-10-09 18:28:09 +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	scheduler and macro fixes	2014-10-03 09:38:36 -07: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	scheduler and macro fixes	2014-10-03 09:38:36 -07:00
TableViewTest	Adds `std::nothrow` to `new`	2014-08-27 16:31:57 -07:00
ExtensionsTest.cpp	no message	2014-10-09 18:30:39 +08:00
ExtensionsTest.h	Squashed commit of the following:	2014-05-14 10:07:09 -07:00