Ubuntu One Music App for iOS

Merge lp://qastaging/~threeve/ubuntuone-ios-music/the-great-renaming into lp://qastaging/ubuntuone-ios-music

the-great-renaming
Merge into trunk

Proposed by Jason Foreman on 2011-07-25

Status:	Merged
Approved by:	Zachery Bir on 2011-07-27
Approved revision:	204
Merged at revision:	203
Proposed branch:	lp://qastaging/~threeve/ubuntuone-ios-music/the-great-renaming
Merge into:	lp://qastaging/ubuntuone-ios-music
Diff against target:	390 lines (+53/-63) 5 files modified .bzrignore (+5/-7) Other Sources/U1MusicAppDelegate.h (+1/-1) Other Sources/U1MusicAppDelegate.m (+3/-3) U1Music.xcodeproj/project.pbxproj (+21/-21) xibs/MainWindow.xib (+23/-31)
To merge this branch:	bzr merge lp://qastaging/~threeve/ubuntuone-ios-music/the-great-renaming
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Zachery Bir		2011-07-25	Approve on 2011-07-27
Review via email: mp+69156@code.qastaging.launchpad.net

Description of the change

Renaming the project and a couple of key classes from 'iSub' to 'U1Music'.

Revision history for this message

Zachery Bir (urbanape) wrote on 2011-07-27:

Approved, with the following diff:

=== modified file 'view_controllers/SettingsViewController.m'
--- view_controllers/SettingsViewController.m 2011-07-11 19:36:38 +0000
+++ view_controllers/SettingsViewController.m 2011-07-27 16:33:38 +0000
@@ -29,7 +29,6 @@
// DAMAGE.

#import "SettingsViewController.h"
-#import "iSubAppDelegate.h"
#import "AboutViewController.h"
#import "Subsonic.h"
#import "Downloader.h"

=== modified file 'view_controllers/SongViewController.m'
--- view_controllers/SongViewController.m 2011-06-23 13:54:49 +0000
+++ view_controllers/SongViewController.m 2011-07-27 16:33:30 +0000
@@ -29,7 +29,6 @@
// DAMAGE.

#import "SongViewController.h"
-#import "iSubAppDelegate.h"
#import "StreamingPlayer.h"
#import "AudioStreamer.h"
#import "Album.h"

review: Approve