Fix Conflict

TheGameExtreme.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,115 +1,247 @@
 {
   "images": [
     {
-      "scale": "2x",
+      "filename": "Icon-Small-40-3.png",
       "size": "20x20",
-      "idiom": "iphone",
+      "scale": "2x",
-      "filename": "Icon40.png"
+      "idiom": "iphone"
     },
     {
-      "scale": "3x",
+      "filename": "Icon-Notification@3x-1.png",
       "size": "20x20",
-      "idiom": "iphone",
+      "scale": "3x",
-      "filename": "Icon60.png"
+      "idiom": "iphone"
     },
     {
+      "filename": "Icon-Small@2x-2.png",
+      "size": "29x29",
       "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "Icon-Small@3x-1.png",
       "size": "29x29",
-      "idiom": "iphone",
+      "scale": "3x",
-      "filename": "Icon58.png"
+      "idiom": "iphone"
     },
     {
+      "filename": "Icon-Small-40@2x-2.png",
+      "size": "40x40",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "Icon-60@2x-2.png",
+      "size": "40x40",
       "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "Icon-60@2x.png",
+      "size": "60x60",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "Icon-60@3x-1.png",
+      "size": "60x60",
+      "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "Icon-Notification-1.png",
+      "size": "20x20",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "Icon-Small-40.png",
+      "size": "20x20",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "Icon-Small-1.png",
       "size": "29x29",
-      "idiom": "iphone",
+      "scale": "1x",
-      "filename": "Icon87.png"
+      "idiom": "ipad"
     },
     {
+      "filename": "Icon-Small@2x.png",
+      "size": "29x29",
       "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "Icon-Small-40-1.png",
       "size": "40x40",
-      "idiom": "iphone",
+      "scale": "1x",
-      "filename": "Icon80.png"
+      "idiom": "ipad"
     },
     {
-      "scale": "3x",
+      "filename": "Icon-Small-40@2x.png",
       "size": "40x40",
-      "idiom": "iphone",
+      "scale": "2x",
-      "filename": "Icon120.png"
+      "idiom": "ipad"
+    },
+    {
+      "filename": "Icon-83.5@2x-1.png",
+      "size": "83.5x83.5",
+      "scale": "2x",
+      "idiom": "ipad"
     },
     {
+      "filename": "Icon-76-1.png",
+      "size": "76x76",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "Icon-76@2x-1.png",
+      "size": "76x76",
       "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "iTunesArtwork@2x-1.png",
+      "size": "1024x1024",
+      "scale": "1x",
+      "idiom": "ios-marketing"
+    },
+    {
       "size": "60x60",
-      "idiom": "iphone",
+      "scale": "2x",
-      "filename": "Icon120.png"
+      "idiom": "car"
     },
     {
-      "scale": "3x",
       "size": "60x60",
-      "idiom": "iphone",
+      "scale": "3x",
-      "filename": "Icon180.png"
+      "idiom": "car"
     },
     {
-      "scale": "1x",
+      "role": "notificationCenter",
-      "size": "20x20",
+      "size": "24x24",
-      "idiom": "ipad",
+      "subtype": "38mm",
-      "filename": "Icon20.png"
+      "scale": "2x",
+      "idiom": "watch"
     },
     {
+      "role": "notificationCenter",
+      "size": "27.5x27.5",
+      "subtype": "42mm",
       "scale": "2x",
-      "size": "20x20",
+      "idiom": "watch"
-      "idiom": "ipad",
-      "filename": "Icon40.png"
     },
     {
-      "scale": "1x",
+      "role": "companionSettings",
       "size": "29x29",
-      "idiom": "ipad",
+      "scale": "2x",
-      "filename": "Icon29.png"
+      "idiom": "watch"
     },
     {
-      "scale": "2x",
+      "role": "companionSettings",
       "size": "29x29",
-      "idiom": "ipad",
+      "scale": "3x",
-      "filename": "Icon58.png"
+      "idiom": "watch"
     },
     {
-      "scale": "1x",
+      "role": "appLauncher",
       "size": "40x40",
-      "idiom": "ipad",
+      "subtype": "38mm",
-      "filename": "Icon40.png"
+      "scale": "2x",
+      "idiom": "watch"
     },
     {
+      "role": "appLauncher",
+      "size": "44x44",
+      "subtype": "40mm",
       "scale": "2x",
-      "size": "40x40",
+      "idiom": "watch"
-      "idiom": "ipad",
+    },
-      "filename": "Icon80.png"
+    {
+      "role": "appLauncher",
+      "size": "50x50",
+      "subtype": "44mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "86x86",
+      "subtype": "38mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "98x98",
+      "subtype": "42mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "108x108",
+      "subtype": "44mm",
+      "scale": "2x",
+      "idiom": "watch"
     },
     {
+      "size": "1024x1024",
       "scale": "1x",
-      "size": "76x76",
+      "idiom": "watch-marketing"
-      "idiom": "ipad",
-      "filename": "Icon76.png"
     },
     {
+      "size": "16x16",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "16x16",
       "scale": "2x",
-      "size": "76x76",
+      "idiom": "mac"
-      "idiom": "ipad",
-      "filename": "Icon152.png"
     },
     {
+      "size": "32x32",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "32x32",
       "scale": "2x",
-      "size": "83.5x83.5",
+      "idiom": "mac"
-      "idiom": "ipad",
-      "filename": "Icon167.png"
     },
     {
+      "size": "128x128",
       "scale": "1x",
-      "size": "1024x1024",
+      "idiom": "mac"
-      "idiom": "ios-marketing",
+    },
-      "filename": "Icon1024.png"
+    {
+      "size": "128x128",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "256x256",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "256x256",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "512x512",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "512x512",
+      "scale": "2x",
+      "idiom": "mac"
     }
   ],
-  "properties": {},
   "info": {
     "version": 1,
     "author": "xcode"

TheGameExtreme.iOS/Info.plist

@@ -19,11 +19,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>bluetooth-central</string>
-		<string>bluetooth-peripheral</string>
-	</array>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>YOUR CUSTOM MESSAGE</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
@@ -31,9 +26,7 @@
 	<key>MinimumOSVersion</key>
 	<string>8.0</string>
 	<key>CFBundleDisplayName</key>
-	<string>TheGameExtreme</string>
+	<string>OrderStacks</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.uca.TheGameExtreme</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>UILaunchStoryboardName</key>
@@ -42,5 +35,9 @@
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>CFBundleName</key>
 	<string>OrderStacks</string>
+	<key>CFBundleIdentifier</key>
+	<string>fr.iut.clermont.orderstacks</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 </dict>
 </plist>

TheGameExtreme.iOS/OrderStacks.csproj

@@ -27,6 +27,7 @@
     <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
+    <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -36,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
-    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignKey>iPhone Distribution</CodesignKey>
+    <CodesignProvision>orderstacks</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,8 +60,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchArch>ARM64</MtouchArch>
-    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodesignProvision>orderstacks</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <AppExtensionDebugBundleId />
@@ -88,45 +91,24 @@
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon1024.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-3.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification%403x-1.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-2.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon180.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x-1.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-2.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-2.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon167.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x-1.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification-1.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon152.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-1.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon120.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-1.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76-1.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon87.png">
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x-1.png" />
-      <Visible>false</Visible>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-83.5%402x-1.png" />
-    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iTunesArtwork%402x-1.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon80.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon76.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon60.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon58.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon40.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon29.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon20.png">
-      <Visible>false</Visible>
-    </ImageAsset>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -183,4 +165,8 @@
   <ItemGroup>
     <Content Include="TrierImageB.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <ITunesArtwork Include="iTunesArtwork" />
+    <ITunesArtwork Include="iTunesArtwork%402x" />
+  </ItemGroup>
 </Project>

TheGameExtreme.iOS/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("TheGameExtreme.iOS")]
+[assembly: AssemblyTitle("OrderStacks.iOS")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

TheGameExtreme.sln

@@ -4,7 +4,7 @@ VisualStudioVersion = 16.0.29326.143
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.Android", "TheGameExtreme.Android\TheGameExtreme.Android.csproj", "{DD6C4FD6-058C-41F9-824F-84DABA5DD444}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.iOS", "TheGameExtreme.iOS\TheGameExtreme.IOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderStacks", "TheGameExtreme.iOS\OrderStacks.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheGameExtreme", "TheGameExtreme\TheGameExtreme.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}"
 EndProject

TheGameExtreme.sln.orig

@@ -0,0 +1,97 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29326.143
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.Android", "TheGameExtreme.Android\TheGameExtreme.Android.csproj", "{DD6C4FD6-058C-41F9-824F-84DABA5DD444}"
+EndProject
+<<<<<<< HEAD
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.iOS", "TheGameExtreme.iOS\TheGameExtreme.IOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
+=======
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderStacks", "TheGameExtreme.iOS\OrderStacks.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
+>>>>>>> b896668931fedb540c57fd019e2adf71c1a62b61
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheGameExtreme", "TheGameExtreme\TheGameExtreme.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{A515F99D-F215-4709-BB23-19DB078CE5AE}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "UnitTestProjectGame", "UnitTestProjectGame\UnitTestProjectGame.csproj", "{28570838-9C77-49B4-9343-B9460C4DF6EA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|Any CPU = Release|Any CPU
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|iPhone.Build.0 = Release|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DD6C4FD6-058C-41F9-824F-84DABA5DD444}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|iPhone.Build.0 = Debug|iPhone
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|iPhone.ActiveCfg = Release|iPhone
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|iPhone.Build.0 = Release|iPhone
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{37A0EC21-60A9-43D2-8B43-3851E1CB7932}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|iPhone.Build.0 = Release|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|iPhone.Build.0 = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A515F99D-F215-4709-BB23-19DB078CE5AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|iPhone.Build.0 = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{28570838-9C77-49B4-9343-B9460C4DF6EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CE861694-2931-4837-843C-8422D2AFC8D6}
+	EndGlobalSection
+EndGlobal