diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad')
| -rw-r--r-- | maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad/xcschemes/maximilianTest.xcscheme | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad/xcschemes/maximilianTest.xcscheme b/maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad/xcschemes/maximilianTest.xcscheme index d891c7f..980a67b 100644 --- a/maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad/xcschemes/maximilianTest.xcscheme +++ b/maximilianTest.xcodeproj/xcuserdata/chris.xcuserdatad/xcschemes/maximilianTest.xcscheme @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme + LastUpgradeVersion = "0500" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -16,7 +17,7 @@ BlueprintIdentifier = "8DD76F620486A84900D96B5E" BuildableName = "rtaudiotest" BlueprintName = "maximilianTest" - ReferencedContainer = "container:maximilianTest.xcodeproj"> + ReferencedContainer = "container:maximilianTest_10.8.xcodeproj"> </BuildableReference> </BuildActionEntry> </BuildActionEntries> @@ -34,7 +35,7 @@ BlueprintIdentifier = "8DD76F620486A84900D96B5E" BuildableName = "rtaudiotest" BlueprintName = "maximilianTest" - ReferencedContainer = "container:maximilianTest.xcodeproj"> + ReferencedContainer = "container:maximilianTest_10.8.xcodeproj"> </BuildableReference> </MacroExpansion> </TestAction> @@ -53,7 +54,7 @@ BlueprintIdentifier = "8DD76F620486A84900D96B5E" BuildableName = "rtaudiotest" BlueprintName = "maximilianTest" - ReferencedContainer = "container:maximilianTest.xcodeproj"> + ReferencedContainer = "container:maximilianTest_10.8.xcodeproj"> </BuildableReference> </BuildableProductRunnable> <AdditionalOptions> @@ -71,7 +72,7 @@ BlueprintIdentifier = "8DD76F620486A84900D96B5E" BuildableName = "rtaudiotest" BlueprintName = "maximilianTest" - ReferencedContainer = "container:maximilianTest.xcodeproj"> + ReferencedContainer = "container:maximilianTest_10.8.xcodeproj"> </BuildableReference> </BuildableProductRunnable> </ProfileAction> |