diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:46 +0200 |
commit | ce110b084c74aa4d5d59a06dd049a12eee6aa5b5 (patch) | |
tree | 5ba47bd689046d0c411240f99fc5e4c4a4595768 /.qmake.conf | |
parent | 5c483fe4fcad1e0474017856996067834cdee6b4 (diff) | |
parent | acebfcd63f34123e9a57d4ab76526eb0dd8cefff (diff) | |
download | qtx11extras-ce110b084c74aa4d5d59a06dd049a12eee6aa5b5.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia284293cbbfbeb5b38661f8e8408628cfa9e2b5a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions