Ubuntu One Music App for iOS

Merge lp:~rockstar/ubuntuone-ios-music/libz into lp:ubuntuone-ios-music

  1. libz
  2. Merge into trunk
Proposed by Paul Hummer
Status: Merged
Approved by: Paul Hummer
Approved revision: 232
Merged at revision: 232
Proposed branch: lp:~rockstar/ubuntuone-ios-music/libz
Merge into: lp:ubuntuone-ios-music
Diff against target: 35 lines (+4/-0)
1 file modified
U1Music.xcodeproj/project.pbxproj (+4/-0)
To merge this branch: bzr merge lp:~rockstar/ubuntuone-ios-music/libz
Reviewer Review Type Date Requested Status
Zachery Bir Approve
Review via email: mp+122192@code.launchpad.net

Commit message

Include libz in deps

Description of the change

*facepalm* When testing seemingly insignificant changes, make sure to do a clean at some point before submitting.

New testflight requires libz (which I knew, but seemed to conveniently forget). I didn't notice until I pulled trunk and did a clean.

To post a comment you must log in.
Revision history for this message
Zachery Bir (urbanape) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'U1Music.xcodeproj/project.pbxproj'
2--- U1Music.xcodeproj/project.pbxproj 2012-08-27 23:00:05 +0000
3+++ U1Music.xcodeproj/project.pbxproj 2012-08-31 05:19:19 +0000
4@@ -26,6 +26,7 @@
5 523B3CFA15B73BA0004394F4 /* download-grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF615B73BA0004394F4 /* download-grey@2x.png */; };
6 523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; };
7 523B3CFC15B73BA0004394F4 /* download@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* download@2x.png */; };
8+ 5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; };
9 5305C2061157F4F800BC78F0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5305C2051157F4F800BC78F0 /* Default.png */; };
10 536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; };
11 537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; };
12@@ -244,6 +245,7 @@
13 523B3CF615B73BA0004394F4 /* download-grey@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "download-grey@2x.png"; sourceTree = "<group>"; };
14 523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; };
15 523B3CF815B73BA0004394F4 /* download@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "download@2x.png"; sourceTree = "<group>"; };
16+ 5279764815F00B2600F8435F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
17 5305C2051157F4F800BC78F0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
18 536D620A1144495400DFCE56 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
19 537DE2D8113F008C00875852 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
20@@ -570,6 +572,7 @@
21 isa = PBXFrameworksBuildPhase;
22 buildActionMask = 2147483647;
23 files = (
24+ 5279764915F00B2600F8435F /* libz.dylib in Frameworks */,
25 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
26 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
27 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
28@@ -599,6 +602,7 @@
29 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
30 isa = PBXGroup;
31 children = (
32+ 5279764815F00B2600F8435F /* libz.dylib */,
33 93F3346C1247FB78006C6707 /* Main */,
34 91018B261359233E0051EFDC /* Base View Controllers */,
35 93F3348C1247FCDC006C6707 /* Root View Controllers */,

Subscribers

People subscribed via source and target branches