summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-31 03:02:27 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-07-31 11:24:14 +0200
commit5c483fe4fcad1e0474017856996067834cdee6b4 (patch)
tree1696e82ac032bb4b00aabff934abbd6cf8730bf0
parentef6aeb61e4c663b8287fc80909cea959fda8ccf0 (diff)
parentafe8c03b6d652ce57118f7a594018867e654edc0 (diff)
downloadqtx11extras-5c483fe4fcad1e0474017856996067834cdee6b4.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: .qmake.conf Change-Id: I1ca6ec9966768bd3a1b910c1987f225e4c31a045
0 files changed, 0 insertions, 0 deletions