diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:12 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:15:53 +0200 |
| commit | 4b167496f6aabdb560c2b40db91bbac371dfda4e (patch) | |
| tree | d6b0c276f8b14b53ccaed09d1beb91ade432d524 | |
| parent | da8249048d509e7fa6cf21d33dd96fa29aed2a70 (diff) | |
| parent | cd886cd4f08570953f1db3557eed974cc3c3737c (diff) | |
| download | qtx11extras-4b167496f6aabdb560c2b40db91bbac371dfda4e.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I424306a2fd8aa2aef3bb7b17de5af66d1eb69b5d
0 files changed, 0 insertions, 0 deletions