summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:00:38 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:00:38 +0100
commit82fc990b849fb3e1296b73169bc21b746664d987 (patch)
treec2a278654e230db1f4c874175c63013c858ea561
parent9f92a9eacbce675195a2ae8bb4bce38300646597 (diff)
parent5ccd29d6720260712655cc6f722824e5fcf11fb3 (diff)
downloadqtscript-82fc990b849fb3e1296b73169bc21b746664d987.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia12b58e1d70fc503f14ad3b14242c54a7ba5ede6
0 files changed, 0 insertions, 0 deletions