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 iss1270_warning

This commit is contained in:
James Chen 2012-05-29 17:12:38 +08:00
parent ad50d6ee57 b2cf68194a
commit ec0b0d18c7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
6463956a32bf45c476904160aa23da947b30e0c1 842462907b895bea8fcf8fc4a567560e546e440f

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

@ -1 +1 @@
4573789c928b734a05fb2766677b230a8a497ee5 c7a3fbb2c6d8e698889720796681db135c37b25b

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

@ -1 +1 @@
1fcdddcfce3211d3619ee0dca4e1a51eec64aeeb a330c09f123bd8de33522f7dedde5def5ea256a6

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

@ -1 +1 @@
eaefdfe660bab51645c3729f121ee363934cda46 6a7a307611b24e912fd48f6075ceab240a16305a