diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:01:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:01:50 +0200 |
| commit | 7a2a6c4474eb5adcc9ba1caa5d009c38c1ac7dc9 (patch) | |
| tree | 8b0f4525746b941025f901b46da95c974053c2f6 /.qmake.conf | |
| parent | 369d5e52bdb667514bae5de30c4e557defd6330d (diff) | |
| parent | 76f3abf8e03344a73e32d1324cd7e6751b4039de (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia2080f82b1ed04535e198aab57ff08ef544072fc
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions