andyque 82f597ce98 Merge branch 'v3.7.1' into v3 ... # Conflicts: # cocos/scripting/lua-bindings/auto/api/CheckBox.lua # cocos/ui/UICheckBox.cpp # cocos/ui/UICheckBox.h		2015-08-12 17:59:50 +08:00
..
AssetsManagerExTest	fix tons of warnings	2015-07-15 12:04:48 +08:00
CocoStudioActionTimelineTest	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +08:00
CocoStudioArmatureTest	fix tons of warnings	2015-07-15 12:04:48 +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 tons of warnings	2015-07-15 12:04:48 +08:00
CocosBuilderTest	tests compiles on xcode 6.3	2015-04-08 17:37:30 -07:00
ControlExtensionTest	fix tons of warnings	2015-07-15 12:04:48 +08:00
NetworkTest	fix tons of warnings	2015-07-15 12:04:48 +08:00
NotificationCenterTest	fix tons of warnings	2015-07-15 12:04:48 +08:00
TableViewTest	fix tons of warnings	2015-07-15 12:04:48 +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