diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:24 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:24 +0100 |
commit | aa7431fdabc0434bc30ae8af0753be8c1cb9b576 (patch) | |
tree | c555156d92222085758caee47810e27ff0c221df /.qmake.conf | |
parent | b5566b980f267380f157cb6084ee77136ee8af2c (diff) | |
parent | adf09500abb022e66358772b48e9c2cfe769fb58 (diff) | |
download | qtsvg-aa7431fdabc0434bc30ae8af0753be8c1cb9b576.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I114745c9743d2d2ef75f27372c2e063d01f67c75
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions