summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-09 03:08:03 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-11 12:05:31 +0200
commit8e61382f432a03a203a3b57cee40d24885336c1d (patch)
tree4ed90847de1d7f1090986c8cf47d2ead11ea58e3
parenta6de6b295ad99cf1830a91c9f87a359bc84658a8 (diff)
parent5fbdb5e5c361d42335427606f6bf9f461718d128 (diff)
downloadqtsvg-8e61382f432a03a203a3b57cee40d24885336c1d.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: .qmake.conf Change-Id: I45da146d028d2f8f7b5661da514dead5e1a33f39
0 files changed, 0 insertions, 0 deletions