diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 17:01:30 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 17:01:30 (GMT) |
commit | 27f96458ba40dcbf5db4df0b0e553ca5799a13c4 (patch) | |
tree | 51903070ae0fa3afa89dce2e128f9e8e5fbb6f0e /src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h | |
parent | 15088d236924bccee787953e04214f87392e8e55 (diff) | |
parent | 466d7562a40eb0c2cf72f57fce0bc5e9b0de37c2 (diff) | |
download | Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.zip Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.tar.gz Qt-27f96458ba40dcbf5db4df0b0e553ca5799a13c4.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Removed nested <ul> elements from the TOC
Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)
Cocoa: quiting the app from the menubar may cause a crash
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h')
0 files changed, 0 insertions, 0 deletions