diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:07:38 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:04:17 +0200 |
| commit | e79b49369dfa87c60d479fa509ba8bdf0abd27a5 (patch) | |
| tree | 8597f5ff1ad9ebcd921d10dd01dbdf8a759ccaf0 | |
| parent | 7f05d1dd2f89c50d4963308838d092a609eb9899 (diff) | |
| parent | fe48c1884cd8e1c4194c3242b482a7b9eb509520 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Iee41b6aad9619534fb626379295f0e65365481f4
0 files changed, 0 insertions, 0 deletions