diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:04:51 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:04:51 +0100 |
commit | 0a75a1aab65da540fc6ab2e824b5787fd4c22520 (patch) | |
tree | b8d91470ea71d19240b9a8f7a476f76c908ecc77 /src/websockets/qwebsocket_p.h | |
parent | bed1842fcded4e784c4cb3f2d55519db6dcacc35 (diff) | |
parent | f5d71e75d217c8313bc70669c52948704e7eda51 (diff) | |
download | qtwebsockets-0a75a1aab65da540fc6ab2e824b5787fd4c22520.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4373631f7e65c3b55178f308d0c7624d6fdf9108
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
0 files changed, 0 insertions, 0 deletions