diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:01:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:01:19 +0200 |
commit | 87a5151adfc9947f2ab2e560fea7da0088eb59c6 (patch) | |
tree | 8bd765856a6fc66a7c03baf497123d924f88e603 /src/websockets/qwebsocketserver.h | |
parent | 597d005c053503e104755bcb7156c0ab2bedfe15 (diff) | |
parent | b5e19190b34b8230752f068670aac14ee1dc1aa4 (diff) | |
download | qtwebsockets-87a5151adfc9947f2ab2e560fea7da0088eb59c6.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/websockets/qwebsocketserver.h')
0 files changed, 0 insertions, 0 deletions