Merge branch 'refs/heads/develop-public' into develop

This commit is contained in:
Andreas Linde 2013-08-16 23:13:50 +02:00
commit 2392e0d169

View File

@ -166,8 +166,8 @@
} }
// use topmost modal view // use topmost modal view
while (parentViewController.modalViewController) { while (parentViewController.presentedViewController) {
parentViewController = parentViewController.modalViewController; parentViewController = parentViewController.presentedViewController;
} }
// special addition to get rootViewController from three20 which has it's own controller handling // special addition to get rootViewController from three20 which has it's own controller handling