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/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme')
| -rw-r--r-- | maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme index 63557c2..d891c7f 100644 --- a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme +++ b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/maximilianTest.xcscheme @@ -22,8 +22,8 @@ </BuildActionEntries> </BuildAction> <TestAction - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" buildConfiguration = "Debug"> <Testables> @@ -39,11 +39,12 @@ </MacroExpansion> </TestAction> <LaunchAction - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" buildConfiguration = "Debug" + ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> <BuildableProductRunnable> |