summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-09 03:07:55 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-11 11:41:38 +0200
commit44c52a3958c65bf68b394902b721bc626484c285 (patch)
tree640f8832da757fa94f55a9115656ea8ca39adbe6
parent5fbdb5e5c361d42335427606f6bf9f461718d128 (diff)
parent347de1dd25366015e3fbbc39ccd1a16ecb18eb2e (diff)
downloadqtsvg-44c52a3958c65bf68b394902b721bc626484c285.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .qmake.conf Change-Id: I5f0336f7eccfb44223e5f3ace62ed2c691ebe863
0 files changed, 0 insertions, 0 deletions