diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:46 +0100 |
| commit | 8571c19b95c62dc17a1ade1ecf49c615ea386a26 (patch) | |
| tree | 03c70fcc9ec88e7dba0779ae0a8e0b3887305c5f | |
| parent | 0810edfe82a8977aff4876d68b7ec4f0eb5fe97f (diff) | |
| parent | a308034012e6cbd35191edb710b721271ce1547a (diff) | |
| download | qtsvg-8571c19b95c62dc17a1ade1ecf49c615ea386a26.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I7a90274afc370a8b0b20b9d5813e30ed812e956d
0 files changed, 0 insertions, 0 deletions