diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 14:02:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 14:02:21 +0200 |
| commit | 68251ad934370ab21938138e670f3ab237b76928 (patch) | |
| tree | 1ce3db9e28b9c0c0f0806987d715a8f3b33fb704 /.qmake.conf | |
| parent | bc1f1fd6259db0882963261e3efe4f1d32949e87 (diff) | |
| parent | 0ebd459bf781ff22a4a0aac460c230874cc0fe52 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I560dc2f9904640f4868a42191281aeac3b0e6ffc
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions