diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 15:05:51 +0100 |
| commit | 534ed7ddbe86c58dc7d59c5c693b027ed8f18737 (patch) | |
| tree | b5fe6e7deec116c213f7eadc5a3b142600bb2a1b /.gitignore | |
| parent | f7c5b8fce9517b3062eeab0ec7e8e46867d1f977 (diff) | |
| parent | 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b (diff) | |
| download | qtwebsockets-534ed7ddbe86c58dc7d59c5c693b027ed8f18737.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/websockets/qwebsocket_p.cpp
tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions