Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/js-bindings/manual/component
History
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 		2015-12-20 22:56:33 +08:00
..
CCComponentJS.cpp Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
CCComponentJS.h Remove ScriptComponent 2015-09-27 22:18:59 +08:00