Merge lp://qastaging/~rockstar/ubuntuone-ios-music/scorched-earth into lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty
Proposed by
Paul Hummer
| Status: | Merged |
|---|---|
| Merged at revision: | 241 |
| Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/scorched-earth |
| Merge into: | lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty |
| Diff against target: |
683 lines (+221/-307) 6 files modified
Music/AppDelegate.h (+22/-0) Music/AppDelegate.m (+149/-0) Music/main.m (+18/-0) Other Sources/main.m (+0/-39) U1Music-Info.plist (+0/-2) U1Music.xcodeproj/project.pbxproj (+32/-266) |
| To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/scorched-earth |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch does exactly what it says it does. It scorches the earth.
I've added a Music folder, and in this folder is all the code for the
re-written music application. Only code owned and copyrighted by Canonical
will go in here.
If you were to run this app, you'd just get a white screen. Nothing else
loads.
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
