summaryrefslogtreecommitdiff
path: root/src/x11extras/doc/src/qtx11extras-module.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:00:53 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:00:53 +0200
commitec18eea6ed408d95110946e9bf2f386711731373 (patch)
treea1020eb09b955ea1dabec9e46976c41652d93d60 /src/x11extras/doc/src/qtx11extras-module.qdoc
parente6474028bacb2a4883f959f3525c513c7538d6a5 (diff)
parentb0fa702623fc8ed600c1c285a3fa5b80d29b5c0c (diff)
downloadqtx11extras-ec18eea6ed408d95110946e9bf2f386711731373.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I024f831891f8fb1908137ed598e197874199706c
Diffstat (limited to 'src/x11extras/doc/src/qtx11extras-module.qdoc')
0 files changed, 0 insertions, 0 deletions