diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:38:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:38:15 +0100 |
| commit | 7545237546f620d09d37f30cb74d18083b868e54 (patch) | |
| tree | d68389458b18a13adf77a94134dfb3d81adc4688 | |
| parent | fcf45723722da5b35eb2973337e497ad1c466d14 (diff) | |
| parent | 2dfb1d046d4a1dcb046bfb287d240a8869c78baa (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ibe762066bb0bd9558fc437e327c5eee2b6008286
0 files changed, 0 insertions, 0 deletions