diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:29 +0100 |
| commit | 2ae3c52fc061f574c9582bf58963fb3996724fbf (patch) | |
| tree | 03c70fcc9ec88e7dba0779ae0a8e0b3887305c5f | |
| parent | 8571c19b95c62dc17a1ade1ecf49c615ea386a26 (diff) | |
| parent | ac797c4e17376b5497e0c37f15b9da48d622d18f (diff) | |
| download | qtsvg-2ae3c52fc061f574c9582bf58963fb3996724fbf.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I67c6c5a71432c36049ee2c5c9827b7151baa977c
0 files changed, 0 insertions, 0 deletions