diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:02:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:02:49 +0200 |
| commit | 050469556e13aac79b32df5857c56445cca97d14 (patch) | |
| tree | e6e02020fb7d2e08f228b9686877f2306c1587c4 /.qmake.conf | |
| parent | 44a28955dc8090dc8e9fa59e57c664e78d24be5e (diff) | |
| parent | 48b4b562a226cd2a8a8805d80b1a52fdc758b1de (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I64b811b323034f04b866b8b7f248f642e4a373b2
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions