diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:04 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:27:30 +0200 |
| commit | 24d368d464d3bc82350b887248825d10902edd66 (patch) | |
| tree | 2381d4cd6831d3483752147519781f5486e53dda | |
| parent | cd886cd4f08570953f1db3557eed974cc3c3737c (diff) | |
| parent | 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 (diff) | |
| download | qtx11extras-24d368d464d3bc82350b887248825d10902edd66.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ica78e08be2c41d921d9d4b80a3edab02082c4f98
0 files changed, 0 insertions, 0 deletions