Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/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
..
cpp-empty-test GLView Hook 2014-07-31 00:53:04 +08:00
cpp-tests Merge pull request #7632 from super626/v3 2014-08-05 09:59:38 +08:00
game-controller-test GLView Hook 2014-07-31 00:53:04 +08:00
lua-empty-test Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 00:37:19 +08:00
lua-game-controller-test Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 00:37:19 +08:00
lua-tests Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 00:37:19 +08:00