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' into #3456 Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCDataReaderHelper.cpp cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-12-24 22:05:13 +08:00
b438181920b978006898ac0e83958cbcb0d7657c