merged in sync ENGINE-654
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Wed, 16 Oct 2019 16:35:08 +0200
branchENGINE-654
changeset 4118b0995cc07d02
parent 4117 60d786f077a8
parent 4115 02086eb45639
child 4119 7311f43f7745
merged in sync
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Oct 16 16:34:46 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Oct 16 16:35:08 2019 +0200
     1.3 @@ -866,11 +866,11 @@
     1.4  			};
     1.5  			buildConfigurationList = 64796A3A1B455AA5004B1C24 /* Build configuration list for PBXProject "pEpEngine" */;
     1.6  			compatibilityVersion = "Xcode 3.2";
     1.7 -			developmentRegion = English;
     1.8 +			developmentRegion = en;
     1.9  			hasScannedForEncodings = 0;
    1.10  			knownRegions = (
    1.11 -				English,
    1.12  				en,
    1.13 +				Base,
    1.14  			);
    1.15  			mainGroup = 64796A361B455AA5004B1C24;
    1.16  			productRefGroup = 64796A401B455AA5004B1C24 /* Products */;
     2.1 --- a/build-mac/pEpEngine.xcodeproj/xcshareddata/xcschemes/pEpEngine.xcscheme	Wed Oct 16 16:34:46 2019 +0200
     2.2 +++ b/build-mac/pEpEngine.xcodeproj/xcshareddata/xcschemes/pEpEngine.xcscheme	Wed Oct 16 16:35:08 2019 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  <?xml version="1.0" encoding="UTF-8"?>
     2.5  <Scheme
     2.6 -   LastUpgradeVersion = "1020"
     2.7 +   LastUpgradeVersion = "1110"
     2.8     version = "1.3">
     2.9     <BuildAction
    2.10        parallelizeBuildables = "NO"
    2.11 @@ -41,8 +41,6 @@
    2.12        selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
    2.13        selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
    2.14        shouldUseLaunchSchemeArgsEnv = "YES">
    2.15 -      <Testables>
    2.16 -      </Testables>
    2.17        <MacroExpansion>
    2.18           <BuildableReference
    2.19              BuildableIdentifier = "primary"
    2.20 @@ -52,8 +50,8 @@
    2.21              ReferencedContainer = "container:pEpEngine.xcodeproj">
    2.22           </BuildableReference>
    2.23        </MacroExpansion>
    2.24 -      <AdditionalOptions>
    2.25 -      </AdditionalOptions>
    2.26 +      <Testables>
    2.27 +      </Testables>
    2.28     </TestAction>
    2.29     <LaunchAction
    2.30        buildConfiguration = "Debug"
    2.31 @@ -74,8 +72,6 @@
    2.32              ReferencedContainer = "container:pEpEngine.xcodeproj">
    2.33           </BuildableReference>
    2.34        </MacroExpansion>
    2.35 -      <AdditionalOptions>
    2.36 -      </AdditionalOptions>
    2.37     </LaunchAction>
    2.38     <ProfileAction
    2.39        buildConfiguration = "Release"