pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14 ... # Conflicts: # cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp # cocos/scripting/js-bindings/manual/js_manual_conversions.cpp # cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp # tests/js-tests/src/SpineTest/SpineTest.js		2016-12-19 12:39:55 +08:00
..
cpp-empty-test	updated for v3.14 (#16942)	2016-12-01 10:37:04 +08:00
cpp-tests	[label] Fixes shadow is drawn incorrect while also enabling outline. (#17024)	2016-12-16 14:56:36 +08:00
game-controller-test	merge v3.13.1 back to v3	2016-09-15 10:08:28 +08:00
js-memory-gc-tests	merge v3.13.1 back to v3	2016-09-15 10:08:28 +08:00
js-tests	Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14	2016-12-19 12:39:55 +08:00
lua-empty-test	Support compile & run project on Tizen by cocos command. (#16783)	2016-11-02 17:41:26 +08:00
lua-game-controller-test	merge v3.13.1 back to v3	2016-09-15 10:08:28 +08:00
lua-tests	Lua tests (#17005)	2016-12-14 09:28:19 +08:00
performance-tests	fixed #16492: RapidJSON Crashes in Release mode on Android. (#16792)	2016-11-04 09:36:59 +08:00