diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:41 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:41 +0100 |
commit | 68d2ada4b03fbdbe9ab98c2ea7097f0a058e10b4 (patch) | |
tree | 48fee0e5cef48a442f816328abe6bac28160df1e /src/websockets/qsslserver.cpp | |
parent | 5b34b19b0a37624a3f5846a949112929ef5feeeb (diff) | |
parent | 9ef6658541c2e816b8119df98c1b66add5b7bcdd (diff) | |
download | qtwebsockets-68d2ada4b03fbdbe9ab98c2ea7097f0a058e10b4.tar.gz |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I3445dc11f83f37a784867762691b372df47ff938
Diffstat (limited to 'src/websockets/qsslserver.cpp')
0 files changed, 0 insertions, 0 deletions