diff -r aedf289192f5 -r 016b3172b645 cocoaTouch/DetailViewController.h
--- a/cocoaTouch/DetailViewController.h	Tue Jun 01 19:33:45 2010 +0000
+++ b/cocoaTouch/DetailViewController.h	Wed Jun 02 13:52:23 2010 +0000
@@ -12,23 +12,21 @@
 @class TeamSettingsViewController;
 @class WeaponSettingsViewController;
 @class SchemeSettingsViewController;
-#ifdef __IPHONE_3_2
-@interface DetailViewController : UITableViewController <UIPopoverControllerDelegate, UISplitViewControllerDelegate> {
-#else
-@interface DetailViewController : UITableViewController {
-#endif
-    id popoverController;
+
+@interface DetailViewController : UITableViewController <UISplitViewControllerDelegate, UIPopoverControllerDelegate> {
     NSArray *controllerNames;
+    
     GeneralSettingsViewController *generalSettingsViewController;
     TeamSettingsViewController *teamSettingsViewController;
     WeaponSettingsViewController *weaponSettingsViewController;
     SchemeSettingsViewController *schemeSettingsViewController;
+    UIPopoverController *popoverController;
 }
 
 // used in iphone version
 -(IBAction) dismissSplitView;
 
-@property (nonatomic, retain) id popoverController;
 @property (nonatomic, retain) NSArray *controllerNames;
+@property (nonatomic,retain) UIPopoverController *popoverController;
 
 @end