diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:00:03 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:00:03 +0200 |
| commit | ca09bb69645cafe38e16c368c49b2864e75892ed (patch) | |
| tree | 20bf42ab2e0948122a8d4584748a2e78ba05bf10 /.qmake.conf | |
| parent | 321353b82fef7c675a5d62bb38c913fdc41e4f27 (diff) | |
| parent | 51cd8493b5d3d7d4e74d3733df6d8ad12f1866fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I040ffc2c6edfb8115aa43da738e326a758117cc8
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions