diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:03 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:37:45 +0200 |
| commit | 6a039e4e77cef7d590c973c27c03a4576d6f5362 (patch) | |
| tree | 6af5bd9bb30da09c36ec42ee8538d0d75bd239fd | |
| parent | b0d2ba210b4709141a4758a2c409d6d14244bbaf (diff) | |
| parent | 55904e9671f4e927308a78d217c0069528ba7f49 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Ie5dd492beacabe7e31b28e225c72b939d6ac0e41
0 files changed, 0 insertions, 0 deletions