diff -r 3ae3fccb439e -r 3836a31879e7 cocoaTouch/MasterViewController.h --- a/cocoaTouch/MasterViewController.h Sun Apr 18 23:19:15 2010 +0000 +++ b/cocoaTouch/MasterViewController.h Mon Apr 19 01:39:55 2010 +0000 @@ -10,17 +10,23 @@ @class DetailViewController; +@class GeneralSettingsViewController; +@class TeamSettingsViewController; +@class WeaponSettingsViewController; +@class SchemeSettingsViewController; @interface MasterViewController : UITableViewController { DetailViewController *detailViewController; - NSArray *optionList; - NSArray *controllers; + NSArray *controllerNames; NSIndexPath *lastIndexPath; + GeneralSettingsViewController *generalSettingsViewController; + TeamSettingsViewController *teamSettingsViewController; + WeaponSettingsViewController *weaponSettingsViewController; + SchemeSettingsViewController *schemeSettingsViewController; } @property (nonatomic, retain) DetailViewController *detailViewController; -@property (nonatomic, retain) NSArray *optionList; -@property (nonatomic, retain) NSArray *controllers; +@property (nonatomic, retain) NSArray *controllerNames; @property (nonatomic, retain) NSIndexPath *lastIndexPath; -(IBAction) dismissSplitView;