diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 21:10:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 21:10:39 (GMT) |
commit | c57195dc899ca732083487ed069ef813c340c0b5 (patch) | |
tree | 63feeab824377985a8380f76c3b0e2e4165642c7 /src/plugins | |
parent | 3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04 (diff) | |
parent | 6b1a8129623e3716f2fc075608b260ce7c381fe2 (diff) | |
download | Qt-c57195dc899ca732083487ed069ef813c340c0b5.zip Qt-c57195dc899ca732083487ed069ef813c340c0b5.tar.gz Qt-c57195dc899ca732083487ed069ef813c340c0b5.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
QSslCertificate: blacklist fraudulent *.google.com
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions