Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/lua-bindings/manual/3d
History
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 		2015-05-24 22:46:05 +08:00
..
lua_cocos2dx_3d_manual.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 2015-05-24 22:46:05 +08:00
lua_cocos2dx_3d_manual.h
…