summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-12 03:01:31 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-12 03:01:31 +0200
commitd2c7fd5b196ba8ccdcbbc6da77e74eab7153bf63 (patch)
tree2ca5606f3466aba11344c1bcbb0e89b00db6d43b /src
parentdb8faea3a21e5a878865e1556c00b93720ebf275 (diff)
parent14205cb57c9b8464e299dba06d4c3d094902400b (diff)
downloadqtsvg-d2c7fd5b196ba8ccdcbbc6da77e74eab7153bf63.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia4ec2a0dde874781c46083513a0c31012f8643c8
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions