diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:02:15 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:02:16 +0200 |
commit | 240f14a7a7b56c3eb6c2bdd34ab9c9ee4bca2990 (patch) | |
tree | ec0b36730450fbc0dd84653e787a48a05fc45889 /tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | |
parent | 6dd15c9f1bfdc010e4cd4b8158435063a5a7d229 (diff) | |
parent | 142d9798d262a41c09a9c43f3ae3a82c771fc800 (diff) | |
download | qtwebsockets-240f14a7a7b56c3eb6c2bdd34ab9c9ee4bca2990.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I5e10d7cc767a3b534f09d5340efe033f5dc700a6
Diffstat (limited to 'tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp')
0 files changed, 0 insertions, 0 deletions