Merge lp://staging/~urbanape/ubuntuone-ios-music/update-release-for-iphone-5 into lp://staging/ubuntuone-ios-music
Proposed by
Paul Hummer
| Status: | Rejected |
|---|---|
| Rejected by: | Paul Hummer |
| Proposed branch: | lp://staging/~urbanape/ubuntuone-ios-music/update-release-for-iphone-5 |
| Merge into: | lp://staging/ubuntuone-ios-music |
| Diff against target: |
145 lines (+62/-1) (has conflicts) 3 files modified
U1Music-Info.plist (+12/-0) U1Music.xcodeproj/project.pbxproj (+49/-0) about/about.html (+1/-1) Text conflict in U1Music-Info.plist Text conflict in U1Music.xcodeproj/project.pbxproj |
| To merge this branch: | bzr merge lp://staging/~urbanape/ubuntuone-ios-music/update-release-for-iphone-5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One iOS Client Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Proposing this for merge into trunk.
To post a comment you must log in.
Unmerged revisions
- 226. By Zachery Bir
-
Bumped version numbers
- 225. By Zachery Bir
-
Added new default.
- 224. By Zachery Bir
-
Updated 2.4-release revision to support an iPhone 5 release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
