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

Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge1204

This commit is contained in:
natural-law 2010-12-04 11:52:01 +08:00
parent 8891b894d6 ad344d69fb
commit 87ec4962cd
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/iphone/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
c7b16ecf8403a233cde168dad676d2a41d5d41c0
3e87e360021a32c29d410aa45c7c508482dd6e3c

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

@ -1 +1 @@
4d614609763ca8fd94ad6f76d0fd8cc17e9dd36e
0bb2f4cf5b3f115b5b6e7be0e2bd1c5adbfabaab