Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/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 develop Conflicts: cocos2dx/Android.mk cocos2dx/platform/CCImage.h cocos2dx/platform/CCImageCommon_cpp.h cocos2dx/textures/CCTexture2D.h scripting/javascript/bindings/generated
2013-08-08 10:19:09 +08:00
ef439f60fa2a447df2d03f58d0343168f3fe9c89