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"
« Back to merge proposal
Approved, with the following diff:
=== modified file 'view_controlle rs/SettingsView Controller. m' s/SettingsViewC ontroller. m 2011-07-11 19:36:38 +0000 s/SettingsViewC ontroller. m 2011-07-27 16:33:38 +0000
--- view_controller
+++ view_controller
@@ -29,7 +29,6 @@
// DAMAGE.
#import "SettingsViewCo ntroller. h" oller.h"
-#import "iSubAppDelegate.h"
#import "AboutViewContr
#import "Subsonic.h"
#import "Downloader.h"
=== modified file 'view_controlle rs/SongViewCont roller. m' s/SongViewContr oller.m 2011-06-23 13:54:49 +0000 s/SongViewContr oller.m 2011-07-27 16:33:30 +0000
--- view_controller
+++ view_controller
@@ -29,7 +29,6 @@
// DAMAGE.
#import "SongViewContro ller.h"
-#import "iSubAppDelegate.h"
#import "StreamingPlayer.h"
#import "AudioStreamer.h"
#import "Album.h"