summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qt_x11_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-26 15:45:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-26 15:45:39 (GMT)
commit708978d1c18cf938a4e0c29a5a90be5de4e82140 (patch)
treef5cffe53e184e5f92167d99a42f5b36f3fc6abb6 /src/gui/kernel/qt_x11_p.h
parentb3ae679b780dc298600b3d3e716ff9657380e2c3 (diff)
parent6078989c33aaea5836d179f7bc8e666f3622ab97 (diff)
downloadQt-708978d1c18cf938a4e0c29a5a90be5de4e82140.zip
Qt-708978d1c18cf938a4e0c29a5a90be5de4e82140.tar.gz
Qt-708978d1c18cf938a4e0c29a5a90be5de4e82140.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: Implement navigation history menus. Fix typo. Remove some leftovers.
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
0 files changed, 0 insertions, 0 deletions