summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 13:23:35 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 13:23:35 +0100
commitcf3f01e3a50c9a9405ea0b8435e1bad33b5faffb (patch)
tree72bace43a5d02e8278c436ff34fbfe83a0a41cb5
parent588dbd7a680538d7880fdd5259a3c12a88338a85 (diff)
parenta844c1c36551665f19be8a69c0e5e608d24f3a8e (diff)
downloadqtsvg-cf3f01e3a50c9a9405ea0b8435e1bad33b5faffb.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: .qmake.conf Change-Id: Ib767ec23fe87c9eb78928994a5e7d7aff65d278b
0 files changed, 0 insertions, 0 deletions