Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 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
2013-08-28 15:35:33 +08:00
27494a13c3cc6a7f31b43439297899a79bda0a02