Merge remote-tracking branch 'OpenEmu/master'

This commit is contained in:
Christoph Leimbrock
2011-08-29 20:22:13 +02:00
+15
View File
@@ -187,6 +187,13 @@
remoteGlobalIDString = C6B947E61365080B00A425F0;
remoteInfo = Genesis;
};
C6F5704613E4778F0078696A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 82287C47101E9F060072172D /* OpenEmu.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C646574813771F12002A4F70;
remoteInfo = "GameBoy Advance";
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -415,6 +422,7 @@
C6B94802136508F400A425F0 /* SuperNES.oesystemplugin */,
C6B94804136508F400A425F0 /* GameBoy.oesystemplugin */,
C6B94806136508F400A425F0 /* Genesis.oesystemplugin */,
C6F5704713E4778F0078696A /* GameBoy Advance.oesystemplugin */,
);
name = Products;
sourceTree = "<group>";
@@ -703,6 +711,13 @@
remoteRef = C6B94805136508F400A425F0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C6F5704713E4778F0078696A /* GameBoy Advance.oesystemplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "GameBoy Advance.oesystemplugin";
remoteRef = C6F5704613E4778F0078696A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */