diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:08 +0100 |
| commit | 5d66ee6af892f24b105e80d5b9634354395ce559 (patch) | |
| tree | 3e29fc1458e1f74186ce488d6ceb1ab68c4767c6 /src/websockets/qwebsocketserver.cpp | |
| parent | 247373d6501bab94ce1ea0048e390bd910963db9 (diff) | |
| parent | bac5a37663249edb9a9746687a7128c013af0309 (diff) | |
| download | qtwebsockets-5d66ee6af892f24b105e80d5b9634354395ce559.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I257bd86335c6c9cf183001a924cd3e43183eff87
Diffstat (limited to 'src/websockets/qwebsocketserver.cpp')
0 files changed, 0 insertions, 0 deletions