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

Removing the conflict generated files.

This commit is contained in:
godyZ 2013-08-08 16:22:44 +08:00
parent a172a87564
commit 1048d30863
4 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2d_libs.xcodeproj/project.pbxproj.BACKUP.23553.pbxproj.REMOVED.git-id
View File

@ -1 +0,0 @@
92223bf7588948557353e321b199382ca75ba550

1
cocos2d_libs.xcodeproj/project.pbxproj.BASE.23553.pbxproj.REMOVED.git-id
View File

@ -1 +0,0 @@
0e11ea510c133e9dcecc692632cf3c6eeeb1fd8d

1
cocos2d_libs.xcodeproj/project.pbxproj.LOCAL.23553.pbxproj.REMOVED.git-id
View File

@ -1 +0,0 @@
ad2a0f76d607e40e6d365b941b44c96f6901aa02

1
cocos2d_libs.xcodeproj/project.pbxproj.REMOTE.23553.pbxproj.REMOVED.git-id
View File

@ -1 +0,0 @@
2be27e9efb6c86c102b456842fc79a7b397910e0