summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket_openssl.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-28 01:00:23 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-28 01:00:36 +0200
commit8a31f9ff8495d141116431b63db7399244b3aace (patch)
tree096426673daaac690735a86b10a26c2e625cd424 /src/network/ssl/qsslsocket_openssl.cpp
parent0d6b4b519272915c2690ee12d1834823747233ab (diff)
parent7265fb0597a52692ffeb455a3da1271903b8cd58 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
0 files changed, 0 insertions, 0 deletions