summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qkeysequence.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-19 10:46:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-19 10:46:36 (GMT)
commit16f1618c62c9e292d9feaed7f967e360c1d27520 (patch)
tree8da2834b685780408443ccd09e0fe3213ab0b644 /src/gui/kernel/qkeysequence.h
parent7d89ca8957ed4aac56822001d4ef84913e7362ae (diff)
parentae42acb65c67afc9c48744057cf75de151a91f15 (diff)
downloadQt-16f1618c62c9e292d9feaed7f967e360c1d27520.zip
Qt-16f1618c62c9e292d9feaed7f967e360c1d27520.tar.gz
Qt-16f1618c62c9e292d9feaed7f967e360c1d27520.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Improved qt_x11_wait_for_window_manager
Diffstat (limited to 'src/gui/kernel/qkeysequence.h')
0 files changed, 0 insertions, 0 deletions