Pulled in trunk changes because the iOS 6 bug was making it impossible to test

1 files changed, 10 insertions, 0 deletions

@@ -104,6 +104,7 @@
                 6C19F1651401917900F9CCD3 /* feedback2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C19F1641401917900F9CCD3 /* feedback2.png */; };
                 6C29041013EAEB590032DA0F /* TutorialBubble.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C29040F13EAEB590032DA0F /* TutorialBubble.m */; };
                 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; };
+                6C2A07781436100C007AB76C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C2A07771436100C007AB76C /* CoreMotion.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; };
                 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE113FC2713002B21AF /* tutorial2.png */; };
                 6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; };
@@ -434,6 +435,7 @@
                 6C29040E13EAEB590032DA0F /* TutorialBubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialBubble.h; sourceTree = "<group>"; };
                 6C29040F13EAEB590032DA0F /* TutorialBubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialBubble.m; sourceTree = "<group>"; };
                 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; };
+                6C2A07771436100C007AB76C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
                 6C39CFDF13FC2708002B21AF /* tutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial.png; sourceTree = "<group>"; };
                 6C39CFE113FC2713002B21AF /* tutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial2.png; sourceTree = "<group>"; };
                 6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = "<group>"; };
@@ -670,6 +672,7 @@
                         isa = PBXFrameworksBuildPhase;
                         buildActionMask = 2147483647;
                         files = (
+                                6C2A07781436100C007AB76C /* CoreMotion.framework in Frameworks */,
                                 DCCBF1B70F6022AE0040855A /* CoreGraphics.framework in Frameworks */,
                                 DCCBF1B90F6022AE0040855A /* Foundation.framework in Frameworks */,
                                 DCCBF1BB0F6022AE0040855A /* OpenGLES.framework in Frameworks */,
@@ -740,6 +743,7 @@
                         children = (
                                 6C88B69314119B5A0049E402 /* libTestFlight.a */,
                                 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */,
+                                6C2A07771436100C007AB76C /* CoreMotion.framework */,
                                 DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */,
                                 DCCBF1B80F6022AE0040855A /* Foundation.framework */,
                                 DCCBF1BA0F6022AE0040855A /* OpenGLES.framework */,
@@ -1680,6 +1684,7 @@
                                 INFOPLIST_FILE = Resources/Info.plist;
                                 INFOPLIST_PREFIX_HEADER = Versioning.h;
                                 INFOPLIST_PREPROCESS = YES;
+                                IPHONEOS_DEPLOYMENT_TARGET = 3.0;
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "\"$(SRCROOT)\"",
@@ -1689,6 +1694,7 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = Cartographic;
+                                SDKROOT = iphoneos;
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };
@@ -1712,6 +1718,7 @@
                                 INFOPLIST_FILE = Resources/Info.plist;
                                 INFOPLIST_PREFIX_HEADER = Versioning.h;
                                 INFOPLIST_PREPROCESS = YES;
+                                IPHONEOS_DEPLOYMENT_TARGET = 3.0;
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "\"$(SRCROOT)\"",
@@ -1721,6 +1728,7 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = Cartographic;
+                                SDKROOT = iphoneos;
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };
@@ -1815,6 +1823,7 @@
                                 INFOPLIST_FILE = Resources/Info.plist;
                                 INFOPLIST_PREFIX_HEADER = Versioning.h;
                                 INFOPLIST_PREPROCESS = YES;
+                                IPHONEOS_DEPLOYMENT_TARGET = 3.0;
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "\"$(SRCROOT)\"",
@@ -1824,6 +1833,7 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = Cartographic;
+                                SDKROOT = iphoneos;
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };