diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-11 20:17:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-11 20:17:45 +0200 |
| commit | 825df0cef516fb84adab88a31106e214f2b29b2d (patch) | |
| tree | e6e7fb12b1c77faa65df20106c8bf342a410b690 /tests | |
| parent | 75042d31d1d267d0a4091932c95579747a102e9d (diff) | |
| parent | cd26439ac7ca1a444e9b5534a504afb0bb411890 (diff) | |
| download | qtwebsockets-825df0cef516fb84adab88a31106e214f2b29b2d.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/websockets/simplechat/chatserver.cpp
Change-Id: I98697cef4c05516b5b4122ad81c084546d57115f
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions