diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:12:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:12:21 +0200 |
| commit | e71467cb569c8d1453e023701b17c9ce9e3fdb86 (patch) | |
| tree | 2eec2d62a29aec220d18d2c0eb997a95e924819c /.qmake.conf | |
| parent | cf41cd16a1f156d68f9cb4a84dd77230f29d739f (diff) | |
| parent | 10ce467a825f2de5a5cb934c4ef21e76f8840a07 (diff) | |
| download | qtwebsockets-e71467cb569c8d1453e023701b17c9ce9e3fdb86.tar.gz | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I12836aa3a50f3fdfabe4bf7ef163905d993fff12
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions