diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:01:58 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:52:04 +0200 |
| commit | 4ac74dbd01a402dc8afd552116ee64bd0583b252 (patch) | |
| tree | 4ea9ebba80170bdeb24d5230a539696181c3af2a | |
| parent | fb0dc08c88a8a1e0bae6ab5d61af9a97e63b614b (diff) | |
| parent | 89edc161514a75b353b9efedb0a3628b62978e6e (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I5f06a85aa81655bfb21d67fc1fcef03b3f00d61b
0 files changed, 0 insertions, 0 deletions