diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-11 15:42:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-11 15:42:27 +0200 |
| commit | cd26439ac7ca1a444e9b5534a504afb0bb411890 (patch) | |
| tree | e6901020de599f4764e3120bb7172ba528f1d0a8 /tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | |
| parent | 5775c5e344e94f47af73d0d72a631375fb10d3d5 (diff) | |
| parent | b05ec56db6f17f04387af72b8e1b9a64b1092daa (diff) | |
| download | qtwebsockets-cd26439ac7ca1a444e9b5534a504afb0bb411890.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2
Conflicts:
.qmake.conf
Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
Diffstat (limited to 'tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp')
0 files changed, 0 insertions, 0 deletions