Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f |
||
|---|---|---|
| .. | ||
| certs | ||
| .gitignore | ||
| BLACKLIST | ||
| qsslsocket.pro | ||
| ssl.tar.gz | ||
| tst_qsslsocket.cpp | ||