summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:27:51 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:27:51 +0100
commitf799d19d6df12e20fc133ef8466d310427cc68ca (patch)
tree63cec421f99980524469a76667939ab153bc747f /src
parent82578970d435e17738612c7bd6c1f4a9f58468cc (diff)
parentd477ec8f40b28caf3a216d9e8550d8871d5131fb (diff)
downloadqtsvg-f799d19d6df12e20fc133ef8466d310427cc68ca.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts: .qmake.conf Change-Id: I0b324787e01b6020604303de25fb135116d18319
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions