summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-31 03:04:26 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-31 03:04:27 +0100
commit370a7c165bf3bb46195b7077c5a88bd97bb67d17 (patch)
treec9aebb2e35dad0f6c37b81e03062fbbb2cd706d6 /src/websockets/qwebsocket_p.h
parent0a75a1aab65da540fc6ab2e824b5787fd4c22520 (diff)
parentf42b228928c3e51c46bdf0ef855b4832fa59817e (diff)
downloadqtwebsockets-370a7c165bf3bb46195b7077c5a88bd97bb67d17.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iadc78fcc7fa79f17c9ae0acf0ce74291491766b4
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
0 files changed, 0 insertions, 0 deletions