Merge lp://qastaging/~rockstar/ubuntuone-ios-music/dependencies into lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty
Proposed by
Paul Hummer
Status: | Merged |
---|---|
Merged at revision: | 242 |
Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/dependencies |
Merge into: | lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty |
Prerequisite: | lp://qastaging/~rockstar/ubuntuone-ios-music/scorched-earth |
Diff against target: |
246 lines (+125/-17) 1 file modified
U1Music.xcodeproj/project.pbxproj (+125/-17) |
To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/dependencies |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike McCracken (community) | Approve | ||
dobey (community) | Approve | ||
Review via email:
|
Description of the change
This branch adds the RestKit dependency.
To post a comment you must log in.
on line 208 and 231, this looks weird:
+ "\"$(BUILT_ PRODUCTS_ DIR)/.. /../Headers\ "/**",
What does that look like in XCode's UI? Looking at the backslash and double-star, I wonder if that's actually doing anything or just getting ignored?