Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build/cocos2d_libs.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 developHttp Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
2013-10-31 21:57:24 +08:00
f918efd122d7a0cfabddf411f64d954d4fcd8579