diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:01:15 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:01:15 +0100 |
commit | d760d21a7513af819ab9e3a643740f74363d86f8 (patch) | |
tree | 643f3860052c5ee50b3f9ab53481a4f552c025c4 /.qmake.conf | |
parent | 401bdecabb950001ae3294e864ed397d1b76b3f4 (diff) | |
parent | 60d6d83ea0c43462d5f8e17aaa654ab6f625dd6e (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ib616603daf31bbfa24812f4194b0789731b8d9a2
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions