diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:25:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 14:03:14 +0200 |
commit | fdb6d8370f9ae8fa148124289317c108399853c3 (patch) | |
tree | 032df3423d24599d99700cda7dae8d67f6803068 /tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | |
parent | b73b3f8a5cb566ff8219b14647f0ceae29cfe6b2 (diff) | |
parent | fb71c823a7ae823345518ca33ccfe273fcf76494 (diff) | |
download | qtwebsockets-fdb6d8370f9ae8fa148124289317c108399853c3.tar.gz |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I3dd9c568ed9160510bff527355ecfbed5d4690a9
Diffstat (limited to 'tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp')
0 files changed, 0 insertions, 0 deletions