diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:37:57 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 12:07:02 +0200 |
commit | c408c9e49710dab4fe8f0f4c2bbfc96219db25b5 (patch) | |
tree | ab8a413da29c7bb15b6da49c9f0851519b03adb7 /.qmake.conf | |
parent | 511d6f2502ddc480716e83be0d74a8c0f9387dc6 (diff) | |
parent | bb2a0d2f8e39fc6392839d12ea079142ea259a8e (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions