Conflicts: src/corelib/io/qstorageinfo_unix.cpp src/network/ssl/qsslsocket_openssl.cpp Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20 |
||
|---|---|---|
| .. | ||
| aspiriniks.ca.crt | ||
| fluke.cert | ||
| fluke.key | ||
| qt-test-net-cacert.pem | ||
| qt-test-server-cacert.pem | ||
| qt-test-server-host-network-cacert.pem | ||
| server.key | ||
| server.pem | ||