mirror of https://github.com/axmolengine/axmol.git
1dabab2ca5
Conflicts: scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js |
||
---|---|---|
.. | ||
Cpp | ||
Javascript | ||
Lua | ||
samples.xcodeproj |