Conflicts:
dist/changes-5.4.0
|
||
|---|---|---|
| .. | ||
| qasn1element | ||
| qsslcertificate | ||
| qsslcipher | ||
| qsslerror | ||
| qsslkey | ||
| qsslsocket | ||
| qsslsocket_onDemandCertificates_member | ||
| qsslsocket_onDemandCertificates_static | ||
| ssl.pro | ||
Conflicts:
dist/changes-5.4.0
|
||
|---|---|---|
| .. | ||
| qasn1element | ||
| qsslcertificate | ||
| qsslcipher | ||
| qsslerror | ||
| qsslkey | ||
| qsslsocket | ||
| qsslsocket_onDemandCertificates_member | ||
| qsslsocket_onDemandCertificates_static | ||
| ssl.pro | ||