Skip to content
Browse files

Fixed .gitignore conflict.

Signed-off-by: Brad O'Hearne <brado@bighillsoftware.com>
  • Loading branch information...
2 parents 1157521 + cf6a493 commit 0e995a6d1364f5cd2254c208b3fc2cce26a8d777 @brado brado committed Jun 18, 2011
Showing with 5 additions and 5 deletions.
  1. +1 −1 Code/Fremont/Classes/FMXMLDataTypeConverter.h
  2. +4 −4 Code/Fremont/Fremont.xcodeproj/project.pbxproj
View
2 Code/Fremont/Classes/FMXMLDataTypeConverter.h
@@ -18,7 +18,7 @@
+ (NSString *)numberIdToString:(id)object;
+ (NSString *)dateIdToString:(id)object withFormat:(NSString *)formatString;
+ (NSString *)booleanIdToString:(id)object;
-+ (NSString *)dataIdToString:(id)object;
++ (NSString *)dataIdToString:(id)object;
+ (NSString *)enumIdToString:(id)object;
+ (NSString *)numberToString:(NSNumber *)value;
View
8 Code/Fremont/Fremont.xcodeproj/project.pbxproj
@@ -336,10 +336,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
- SDKROOT = iphoneos4.2;
+ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -351,10 +351,10 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
- SDKROOT = iphoneos4.2;
+ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;

0 comments on commit 0e995a6

Please sign in to comment.
Something went wrong with that request. Please try again.