diff options
author | Starla Insigna <starla4444@gmail.com> | 2013-01-02 23:27:26 -0500 |
---|---|---|
committer | Starla Insigna <starla4444@gmail.com> | 2013-01-02 23:27:26 -0500 |
commit | ba19dd3f2517a95e09dcfe288a781c6f335b5e81 (patch) | |
tree | 681e43be807ed46b75dab6b291a6a6dd3e67b6e5 /Classes/Cart_CollectAppDelegate.m | |
parent | 28497668761472e085d0c9955aa8077d11bf353c (diff) | |
parent | f82fdb7134632c1a52902d44c0d555dac0225898 (diff) | |
download | cartcollect-ba19dd3f2517a95e09dcfe288a781c6f335b5e81.tar.gz cartcollect-ba19dd3f2517a95e09dcfe288a781c6f335b5e81.tar.bz2 cartcollect-ba19dd3f2517a95e09dcfe288a781c6f335b5e81.zip |
Pulled in trunk changes because the iOS 6 bug was making it impossible to test
Diffstat (limited to 'Classes/Cart_CollectAppDelegate.m')
-rwxr-xr-x | Classes/Cart_CollectAppDelegate.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Classes/Cart_CollectAppDelegate.m b/Classes/Cart_CollectAppDelegate.m index 25a2aa4..c92d231 100755 --- a/Classes/Cart_CollectAppDelegate.m +++ b/Classes/Cart_CollectAppDelegate.m | |||
@@ -114,7 +114,8 @@ | |||
114 | [viewController setView:glView]; | 114 | [viewController setView:glView]; |
115 | 115 | ||
116 | // make the View Controller a child of the main window | 116 | // make the View Controller a child of the main window |
117 | [window addSubview: viewController.view]; | 117 | [window setRootViewController:viewController]; |
118 | //[window addSubview: viewController.view]; | ||
118 | 119 | ||
119 | [window makeKeyAndVisible]; | 120 | [window makeKeyAndVisible]; |
120 | 121 | ||