diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 05:19:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 05:19:03 (GMT) |
commit | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (patch) | |
tree | e2e4cf7c5f7c890fc5e8935dd57ac98e2d80de96 /src/gui/kernel/qt_x11_p.h | |
parent | bd202b822401989aa1abe3e2ad24344d71d6dfb3 (diff) | |
parent | 264f4451667e7da90e63cf87a2b4a6eb72a14d3b (diff) | |
download | Qt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.zip Qt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.tar.gz Qt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.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:
Rhys Weatherley's changes for 4.6.2
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
0 files changed, 0 insertions, 0 deletions