Permalink
Browse files

Merge remote branch 'facebook/v1.0'

  • Loading branch information...
diederich committed Feb 11, 2011
2 parents 1d82a22 + a9a5c4a commit 532e1079f2b0f06c66d3aab580bcd7a436a56628
Showing 866 changed files with 5,405 additions and 10,761 deletions.
View
@@ -5,6 +5,8 @@ Products
*.pbxuser
*.perspectivev3
*.mode1v3
+*.xcworkspace
+xcuserdata
.DS_Store
src/Three20/*.h
src/Three20Core/*.h
@@ -13,3 +15,4 @@ src/Three20Style/*.h
src/Three20UICommon/*.h
src/Three20UINavigator/*.h
src/Three20UI/*.h
+extensions/
View
No changes.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
667F83E01262FE21008ADC61 /* libThree20Core-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 66C2E1101262F7BF006DF55A /* libThree20Core-Xcode3.2.5.a */; };
- 667F83E11262FE27008ADC61 /* libThree20Core-Xcode3.2.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 66C2E1121262F7BF006DF55A /* libThree20Core-Xcode3.2.2.a */; };
668DCFEB1262FA51004C9828 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 668DCFEA1262FA51004C9828 /* Default@2x.png */; };
66A05B111262FB5B00CE83EF /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E94C678116D97FF0012B12C /* Default.png */; };
66A05B121262FB5B00CE83EF /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E94C679116D97FF0012B12C /* Icon.png */; };
@@ -23,15 +22,6 @@
66A05B1A1262FB5B00CE83EF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
66A05B1B1262FB5B00CE83EF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EEFB94311627E29009B479E /* UIKit.framework */; };
66A05B1C1262FB5B00CE83EF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EEFBAEB11627F2E009B479E /* CoreGraphics.framework */; };
- 66C2E1971262FAA0006DF55A /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E94C678116D97FF0012B12C /* Default.png */; };
- 66C2E1981262FAA0006DF55A /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E94C679116D97FF0012B12C /* Icon.png */; };
- 66C2E1991262FAA0006DF55A /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6E64601A1187B3CD00F08CB1 /* Three20.bundle */; };
- 66C2E19C1262FAA0006DF55A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
- 66C2E19D1262FAA0006DF55A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; };
- 66C2E19E1262FAA0006DF55A /* PlaygroundViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEFBBAA1162829A009B479E /* PlaygroundViewController.m */; };
- 66C2E1A01262FAA0006DF55A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
- 66C2E1A11262FAA0006DF55A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EEFB94311627E29009B479E /* UIKit.framework */; };
- 66C2E1A21262FAA0006DF55A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EEFBAEB11627F2E009B479E /* CoreGraphics.framework */; };
6E645D6E1187999F00F08CB1 /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E645D6B1187999700F08CB1 /* libThree20Core.a */; };
6E64601B1187B3CD00F08CB1 /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6E64601A1187B3CD00F08CB1 /* Three20.bundle */; };
6E94C67A116D97FF0012B12C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E94C678116D97FF0012B12C /* Default.png */; };
@@ -49,41 +39,20 @@
remoteGlobalIDString = 6650CA791262F6E2003FF804;
remoteInfo = "Three20Core-Xcode3.2.5";
};
- 66785E781262FD400076FFD2 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 66C2E0D11262F748006DF55A;
- remoteInfo = "Three20Core-Xcode3.2.2";
- };
66C2E10F1262F7BF006DF55A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6650CAA21262F6E2003FF804;
remoteInfo = "Three20Core-Xcode3.2.5";
};
- 66C2E1111262F7BF006DF55A /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66C2E0FC1262F748006DF55A;
- remoteInfo = "Three20Core-Xcode3.2.2";
- };
66CFC0F71262F50D00E57607 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 664961641262EE5000C2C80E;
remoteInfo = "UnitTests-Xcode3.2.5";
};
- 66CFC0F91262F50D00E57607 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66F9A63C1262ED9F0059C2AE;
- remoteInfo = "UnitTests-Xcode3.2.2";
- };
6E645D6A1187999700F08CB1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E645D621187999700F08CB1 /* Three20Core.xcodeproj */;
@@ -115,7 +84,6 @@
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
668DCFEA1262FA51004C9828 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../../Resources/Default@2x.png"; sourceTree = SOURCE_ROOT; };
66A05B211262FB5B00CE83EF /* TTCoreDemo-Xcode3.2.5.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TTCoreDemo-Xcode3.2.5.app"; sourceTree = BUILT_PRODUCTS_DIR; };
- 66C2E1A71262FAA0006DF55A /* TTCoreDemo-Xcode3.2.2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TTCoreDemo-Xcode3.2.2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
6E645D621187999700F08CB1 /* Three20Core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Core.xcodeproj; path = ../../../src/Three20Core/Three20Core.xcodeproj; sourceTree = SOURCE_ROOT; };
6E645DCD11879B0400F08CB1 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Project.xcconfig; path = ../Configurations/Project.xcconfig; sourceTree = "<group>"; };
6E645DCE11879B0400F08CB1 /* UnitTests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = UnitTests.xcconfig; path = ../Configurations/UnitTests.xcconfig; sourceTree = "<group>"; };
@@ -156,17 +124,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 66C2E19F1262FAA0006DF55A /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 66C2E1A01262FAA0006DF55A /* Foundation.framework in Frameworks */,
- 66C2E1A11262FAA0006DF55A /* UIKit.framework in Frameworks */,
- 66C2E1A21262FAA0006DF55A /* CoreGraphics.framework in Frameworks */,
- 667F83E11262FE27008ADC61 /* libThree20Core-Xcode3.2.2.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -184,7 +141,6 @@
isa = PBXGroup;
children = (
1D6058910D05DD3D006BFB54 /* TTCoreDemo.app */,
- 66C2E1A71262FAA0006DF55A /* TTCoreDemo-Xcode3.2.2.app */,
66A05B211262FB5B00CE83EF /* TTCoreDemo-Xcode3.2.5.app */,
);
name = Products;
@@ -241,10 +197,8 @@
children = (
6E645D6B1187999700F08CB1 /* libThree20Core.a */,
66C2E1101262F7BF006DF55A /* libThree20Core-Xcode3.2.5.a */,
- 66C2E1121262F7BF006DF55A /* libThree20Core-Xcode3.2.2.a */,
6E645D6D1187999700F08CB1 /* CoreUnitTests.octest */,
66CFC0F81262F50D00E57607 /* CoreUnitTests-Xcode3.2.5.octest */,
- 66CFC0FA1262F50D00E57607 /* CoreUnitTests-Xcode3.2.2.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -317,24 +271,6 @@
productReference = 66A05B211262FB5B00CE83EF /* TTCoreDemo-Xcode3.2.5.app */;
productType = "com.apple.product-type.application";
};
- 66C2E1931262FAA0006DF55A /* TTCoreDemo-Xcode3.2.2 */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 66C2E1A41262FAA0006DF55A /* Build configuration list for PBXNativeTarget "TTCoreDemo-Xcode3.2.2" */;
- buildPhases = (
- 66C2E1961262FAA0006DF55A /* Resources */,
- 66C2E19B1262FAA0006DF55A /* Sources */,
- 66C2E19F1262FAA0006DF55A /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- 66785E791262FD400076FFD2 /* PBXTargetDependency */,
- );
- name = "TTCoreDemo-Xcode3.2.2";
- productName = TTCoreDemo;
- productReference = 66C2E1A71262FAA0006DF55A /* TTCoreDemo-Xcode3.2.2.app */;
- productType = "com.apple.product-type.application";
- };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -365,7 +301,6 @@
targets = (
1D6058900D05DD3D006BFB54 /* TTCoreDemo */,
66A05B0D1262FB5B00CE83EF /* TTCoreDemo-Xcode3.2.5 */,
- 66C2E1931262FAA0006DF55A /* TTCoreDemo-Xcode3.2.2 */,
);
};
/* End PBXProject section */
@@ -378,27 +313,13 @@
remoteRef = 66C2E10F1262F7BF006DF55A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 66C2E1121262F7BF006DF55A /* libThree20Core-Xcode3.2.2.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20Core-Xcode3.2.2.a";
- remoteRef = 66C2E1111262F7BF006DF55A /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
66CFC0F81262F50D00E57607 /* CoreUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "CoreUnitTests-Xcode3.2.5.octest";
remoteRef = 66CFC0F71262F50D00E57607 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 66CFC0FA1262F50D00E57607 /* CoreUnitTests-Xcode3.2.2.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "CoreUnitTests-Xcode3.2.2.octest";
- remoteRef = 66CFC0F91262F50D00E57607 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
6E645D6B1187999700F08CB1 /* libThree20Core.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -438,16 +359,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 66C2E1961262FAA0006DF55A /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 66C2E1971262FAA0006DF55A /* Default.png in Resources */,
- 66C2E1981262FAA0006DF55A /* Icon.png in Resources */,
- 66C2E1991262FAA0006DF55A /* Three20.bundle in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -471,16 +382,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 66C2E19B1262FAA0006DF55A /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 66C2E19C1262FAA0006DF55A /* main.m in Sources */,
- 66C2E19D1262FAA0006DF55A /* AppDelegate.m in Sources */,
- 66C2E19E1262FAA0006DF55A /* PlaygroundViewController.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -489,11 +390,6 @@
name = "Three20Core-Xcode3.2.5";
targetProxy = 66785E741262FD340076FFD2 /* PBXContainerItemProxy */;
};
- 66785E791262FD400076FFD2 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "Three20Core-Xcode3.2.2";
- targetProxy = 66785E781262FD400076FFD2 /* PBXContainerItemProxy */;
- };
6E645D70118799A600F08CB1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Three20Core;
@@ -510,7 +406,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -519,7 +415,7 @@
baseConfigurationReference = 6E645DDE11879B3500F08CB1 /* App.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = YES;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = Release;
};
@@ -548,31 +444,6 @@
};
name = Release;
};
- 66C2E1A51262FAA0006DF55A /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 6E645DDE11879B3500F08CB1 /* App.xcconfig */;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
- OTHER_LDFLAGS = "$(THREE20CORE322_LIB)";
- PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.2";
- SDKROOT = iphoneos3.1.3;
- };
- name = Debug;
- };
- 66C2E1A61262FAA0006DF55A /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 6E645DDE11879B3500F08CB1 /* App.xcconfig */;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- OTHER_LDFLAGS = "$(THREE20CORE322_LIB)";
- PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.2";
- SDKROOT = iphoneos3.1.3;
- };
- name = Release;
- };
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6E645DCD11879B0400F08CB1 /* Project.xcconfig */;
@@ -582,6 +453,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -594,6 +466,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
+ SDKROOT = iphoneos;
};
name = Release;
};
@@ -618,15 +491,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 66C2E1A41262FAA0006DF55A /* Build configuration list for PBXNativeTarget "TTCoreDemo-Xcode3.2.2" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 66C2E1A51262FAA0006DF55A /* Debug */,
- 66C2E1A61262FAA0006DF55A /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTCoreDemo" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
//
-// Copyright 2009-2010 Facebook
+// Copyright 2009-2011 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Oops, something went wrong.

0 comments on commit 532e107

Please sign in to comment.