diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:03 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:05:31 +0200 |
commit | 8e61382f432a03a203a3b57cee40d24885336c1d (patch) | |
tree | 4ed90847de1d7f1090986c8cf47d2ead11ea58e3 /tests | |
parent | a6de6b295ad99cf1830a91c9f87a359bc84658a8 (diff) | |
parent | 5fbdb5e5c361d42335427606f6bf9f461718d128 (diff) | |
download | qtsvg-8e61382f432a03a203a3b57cee40d24885336c1d.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I45da146d028d2f8f7b5661da514dead5e1a33f39
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions