Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/lua-tests
History
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 		2014-08-06 00:37:19 +08:00
..
project Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 00:37:19 +08:00
res/cocosbuilderRes Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
src Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 00:37:19 +08:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00