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
..
js-bindings	Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14	2016-12-19 12:39:55 +08:00
lua-bindings	[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009)	2016-12-14 09:37:46 +08:00