Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@fji8ejfijai83r
fji8ejfijai83r committed Apr 20, 2011
2 parents fa2c56f + 3dfd9e6 commit 7d226cb
Show file tree
Hide file tree
Showing 13 changed files with 4,419 additions and 3,796 deletions.
28 changes: 26 additions & 2 deletions FlickrView.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
320A2827FEC940B25BC42C65 /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB62491134C303F004B9AA0 /* libThree20Core.a */; };
320A5A189C235877202780D5 /* libThree20Network.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB6249D134C303F004B9AA0 /* libThree20Network.a */; };
320A737074758E53BA54BE95 /* libThree20UINavigator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB624C3134C303F004B9AA0 /* libThree20UINavigator.a */; };
320AF8492C47A4D819F7C451 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320AF8492C47A4D819F7C450 /* QuartzCore.framework */; };
320CC833B8AF0ACFD35E6225 /* libThree20Style.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB624AA134C303F004B9AA0 /* libThree20Style.a */; };
320D7DCCE32703ACAB9A45E5 /* libThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB624E4134C303F004B9AA0 /* libThree20.a */; };
320F2C48872C2E2C4DF86205 /* libThree20UI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB624D3134C303F004B9AA0 /* libThree20UI.a */; };
Expand All @@ -36,6 +37,8 @@
3F0D88E1131DF5DA00734292 /* HomePageTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F0D88E0131DF5DA00734292 /* HomePageTableViewController.m */; };
3F10028A1351B97000C89FC5 /* refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F1002881351B97000C89FC5 /* refresh.png */; };
3F10028B1351B97000C89FC5 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 3F1002891351B97000C89FC5 /* [email protected] */; };
3F10041E1352BB2500C89FC5 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F10041D1352BB2500C89FC5 /* RootViewController.m */; };
3F1004571352DEB500C89FC5 /* FVNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F1004561352DEB500C89FC5 /* FVNavigationController.m */; };
3FABF9CB1342ED4700242322 /* SearchBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FABF9CA1342ED4700242322 /* SearchBarController.m */; };
3FABFB9C13448C4A00242322 /* ContactsListTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FABFB9B13448C4A00242322 /* ContactsListTableViewController.m */; };
3FABFBA413448D1900242322 /* ContactsListDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FABFBA313448D1900242322 /* ContactsListDataSource.m */; };
Expand Down Expand Up @@ -257,6 +260,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
320AF8492C47A4D819F7C450 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
3F0D8890131DF28300734292 /* FlickrView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlickrView.app; sourceTree = BUILT_PRODUCTS_DIR; };
3F0D8894131DF28300734292 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
3F0D8896131DF28300734292 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -284,6 +288,10 @@
3F0D88E0131DF5DA00734292 /* HomePageTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomePageTableViewController.m; sourceTree = "<group>"; };
3F1002881351B97000C89FC5 /* refresh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = refresh.png; sourceTree = "<group>"; };
3F1002891351B97000C89FC5 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
3F10041C1352BB2500C89FC5 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
3F10041D1352BB2500C89FC5 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RootViewController.m; sourceTree = "<group>"; };
3F1004551352DEB500C89FC5 /* FVNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FVNavigationController.h; sourceTree = "<group>"; };
3F1004561352DEB500C89FC5 /* FVNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FVNavigationController.m; sourceTree = "<group>"; };
3FABF9C91342ED4700242322 /* SearchBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchBarController.h; sourceTree = "<group>"; };
3FABF9CA1342ED4700242322 /* SearchBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchBarController.m; sourceTree = "<group>"; };
3FABFB9A13448C4A00242322 /* ContactsListTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsListTableViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -367,6 +375,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
320AF8492C47A4D819F7C451 /* QuartzCore.framework in Frameworks */,
3201088596B4756681693705 /* libThree20UICommon.a in Frameworks */,
320D7DCCE32703ACAB9A45E5 /* libThree20.a in Frameworks */,
320A737074758E53BA54BE95 /* libThree20UINavigator.a in Frameworks */,
Expand Down Expand Up @@ -423,6 +432,7 @@
3F0D8893131DF28300734292 /* Frameworks */ = {
isa = PBXGroup;
children = (
320AF8492C47A4D819F7C450 /* QuartzCore.framework */,
3FD96C42131E320F007D5406 /* ObjectiveFlickr.xcodeproj */,
3FB61F7C134C11CD004B9AA0 /* Three20Core.xcodeproj */,
3FB61F7F134C11CD004B9AA0 /* Three20Network.xcodeproj */,
Expand Down Expand Up @@ -517,6 +527,10 @@
3FB9CE15131F965E002F46C4 /* TopPlaceTableViewController.m */,
3F0D88DF131DF5DA00734292 /* HomePageTableViewController.h */,
3F0D88E0131DF5DA00734292 /* HomePageTableViewController.m */,
3F1004551352DEB500C89FC5 /* FVNavigationController.h */,
3F1004561352DEB500C89FC5 /* FVNavigationController.m */,
3F10041C1352BB2500C89FC5 /* RootViewController.h */,
3F10041D1352BB2500C89FC5 /* RootViewController.m */,
3FB9CC16131F39A5002F46C4 /* PhotoSpotsListTableViewController.h */,
3FB9CC17131F39A5002F46C4 /* PhotoSpotsListTableViewController.m */,
3FB9CE58131F9FB6002F46C4 /* SnapAndRunViewController.h */,
Expand Down Expand Up @@ -998,6 +1012,8 @@
3FB6214C134C1E05004B9AA0 /* SearchResultsTableDataSource.m in Sources */,
3FB6214D134C1E05004B9AA0 /* SearchTableViewController.m in Sources */,
3FB6214E134C1E05004B9AA0 /* URLModelResponse.m in Sources */,
3F10041E1352BB2500C89FC5 /* RootViewController.m in Sources */,
3F1004571352DEB500C89FC5 /* FVNavigationController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1106,7 +1122,11 @@
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = three20/Build/Products/three20;
HEADER_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)/../three20",
"$(BUILT_PRODUCTS_DIR)/../../three20",
three20/Build/Products/three20,
);
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
Expand All @@ -1123,7 +1143,11 @@
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = three20/Build/Products/three20;
HEADER_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)/../three20",
"$(BUILT_PRODUCTS_DIR)/../../three20",
three20/Build/Products/three20,
);
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
Expand Down
Loading

0 comments on commit 7d226cb

Please sign in to comment.