diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-10 03:01:16 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-10 03:01:16 +0100 |
commit | 24892e65551f13b904b7b9043d225303a061671a (patch) | |
tree | 759f9967b5f90df09f7c51ed9728635a0b55ed0f /.qmake.conf | |
parent | ad484cb1d763d5b422c287182aadb7b5479acdd5 (diff) | |
parent | 7d653dea516ed8e756814532dc4be742f5e0ce78 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6a7635841698e6de98d94ac8b21a1764f01569e2
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions