summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformintegration.cpp
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-02-21 10:37:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-21 10:37:21 +0100
commit8fd1330029eafc3f9496febd1ac2597e786ba324 (patch)
tree00acd1c068972d2de0083933227fae77824f5447 /src/gui/kernel/qplatformintegration.cpp
parentf9fc180d505382e559ebca8a2e6dd09ea3ae52bc (diff)
parentdcb710dd87ab15c3af803133ff2449902dbec036 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qplatformintegration.cpp')
0 files changed, 0 insertions, 0 deletions