diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 11:54:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 11:54:26 +0100 |
| commit | 810aec012e3382369005a0f1012857797bb6b544 (patch) | |
| tree | 716a9babbf288654f6fd07a3a73f3b423d7a6a81 /.qmake.conf | |
| parent | 692c3af38fae8430fd300733fd85fbcd7507d242 (diff) | |
| parent | c071c4528e48ceee72aeb00ab533e4db383502a0 (diff) | |
| download | qtwebsockets-810aec012e3382369005a0f1012857797bb6b544.tar.gz | |
Merge remote-tracking branch 'origin/5.12.7' into 5.12
Change-Id: Ib06653ecf2d6263ed2ca5178ed0e033d15b6165b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions