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
..
cpp-empty-test	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
cpp-tests	Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1	2015-07-24 11:38:09 +08:00
game-controller-test	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
js-tests	Fixed #12834 Invoke cleanup function when override in JS	2015-07-14 15:35:29 +08:00
lua-empty-test	[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.	2015-06-26 17:12:39 +08:00
lua-game-controller-test	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
lua-tests	[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.	2015-06-26 17:12:39 +08:00