diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:56:40 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:56:40 +0100 |
commit | 59ba2a8c6c6a9c37265b85866404c2f1959c0b92 (patch) | |
tree | e117fec69aa4c29c7ce002f0d49495460c1fdb8e /.qmake.conf | |
parent | 5be220966d28d01e2e879a1a3b63d7bacd41fbc1 (diff) | |
parent | 2a5a86ee4a8af250c4aca26f3e376ac117c0d58d (diff) |
Merge remote-tracking branch 'origin/5.12.6' into 5.12
Change-Id: Ib423c0e634811450ce9ba7d8cfd62741a1217e80
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions