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-new Conflicts: tools/tolua/cocos2dx.ini
2013-08-30 15:21:59 +08:00
a9fdccd58c6cf8ce3cb5d00ea294ef9ff216d439