Merge branch 'master' into ditto

This commit is contained in:
Stephen Lombardo
2011-03-14 12:14:09 -04:00
2 changed files with 16 additions and 5 deletions
+13 -2
View File
@@ -121,7 +121,14 @@
isa = PBXProject;
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 08FB7794FE84155DC02AAC07 /* sqlcipher */;
projectDirPath = "";
projectRoot = "";
@@ -228,7 +235,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
};
name = Debug;
};
@@ -241,7 +250,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
};
name = Release;
};