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 developCCS Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
e1cdac55b4aa56ff532e0d23fe27272510058a42