Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1187_xml

This commit is contained in:
James Chen 2012-04-25 10:56:19 +08:00
parent e8b826b7a6 ff38eda2fe
commit 12e2f15c4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
602577df19c20f69c1a4ae96072923365b422b34
97caf44d91d679d65cd39a8dfc4378df7694d735

2
tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
fa64c2ecb635a4bf3fb7d38c3ca86b1a9c81b376
5ba0d5201d4d8a46cb610cf9e9e0e3d8fcb5bb3c