Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform Conflicts: tests/proj.ios/test.xcodeproj/project.pbxproj
2012-04-24 15:44:53 +08:00
fa64c2ecb635a4bf3fb7d38c3ca86b1a9c81b376