diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:19:16 +0100 |
| commit | 42b135077e653126afef66fb08254f258f49c57e (patch) | |
| tree | 17591491e5d0d4d754b1aff9c5efc5c8a879b261 /.qmake.conf | |
| parent | 7f7502865f980a7d72dc04ffc5f25eecf0d414a8 (diff) | |
| parent | 859d6654ef030494647147046778f4206c04d7f6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ia8bbdf9dcace6e58183da3b627170099f6667fe9
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions