diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:44 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:44 +0100 |
commit | af67afbfded9aa63fa8c9997274ed61c198a9062 (patch) | |
tree | e771e9b0faf0e384b6f6dad6b1f72fd14e96e1d4 /.qmake.conf | |
parent | d0643d4a350c08b8a63558b11c0d63d97b99d78c (diff) | |
parent | aee027f581839caf44de1b176099ef2b22d2fc84 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I997417dd0a95d13c1dd43a3aa13665fdd7a383d5
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions