diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:20:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:20:11 +0100 |
| commit | 2d532f3d84654e75273af4a5a34310413555e00f (patch) | |
| tree | e3e1e87564fcd61af205294913207f5075259db5 /.qmake.conf | |
| parent | f97f5e24fa7f762ed71106dada898780dab3dae3 (diff) | |
| parent | d8f4ce34bc8f3f7930bd4948c0c2a4023bb755a0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I468ec347fe60ae96ea58e7f91832d3828d934fb1
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions