summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketframe.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:04:25 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:04:25 +0100
commitb45ebeece5ee63a94b4ac3c10347e2e14e1fa311 (patch)
tree25d7fd844b5867d6ce201242c9a5d0945e7b23f6 /src/websockets/qwebsocketframe.cpp
parentb21c809462d1f2698781bea5a05ec59e7ddf548b (diff)
parent5b34b19b0a37624a3f5846a949112929ef5feeeb (diff)
downloadqtwebsockets-b45ebeece5ee63a94b4ac3c10347e2e14e1fa311.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9b0aaaa5d918a28bdd388e3c1988e0bc804255db
Diffstat (limited to 'src/websockets/qwebsocketframe.cpp')
0 files changed, 0 insertions, 0 deletions