diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 16:34:05 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 16:34:05 (GMT) |
commit | badecb80cb5458105fb5d113560e83b881e6412a (patch) | |
tree | 0a4fa874baacd1efe9f4311c3cfd3c12d7e54261 /templates | |
parent | 4567766cb696d9900c628fe19a174a42570eed5c (diff) | |
parent | 4d66a933837ffc51fdef01f9485be58d5788b787 (diff) | |
download | Qt-badecb80cb5458105fb5d113560e83b881e6412a.zip Qt-badecb80cb5458105fb5d113560e83b881e6412a.tar.gz Qt-badecb80cb5458105fb5d113560e83b881e6412a.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Cocoa: remove 'double' content view from window"
Cocoa: fix broken drawers after content view structure change
Cocoa: remove 'double' content view from window
Revert the change in applicationShouldTerminate().
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions