diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:36:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 12:06:40 +0200 |
| commit | 10c2ffd4bba25b098f87386383376245bf5baae1 (patch) | |
| tree | b872be82021c8a307afc2541d9c33715e11cf77a /.qmake.conf | |
| parent | 986ce4a02ba9b33b908cdbdc46e3ceda0e50b99f (diff) | |
| parent | 9fae0f9c5ffab7008f705f6bbee87a7115a2aa59 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions