projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c42963 6b1a812)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 30 Aug 2011 21:10:39 +0000 (07:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 30 Aug 2011 21:10:39 +0000 (07:10 +1000)
commitc57195dc899ca732083487ed069ef813c340c0b5
tree63feeab824377985a8380f76c3b0e2e4165642c7tree | snapshot
parent3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04commit | diff
parent6b1a8129623e3716f2fc075608b260ce7c381fe2commit | diff
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
6b46b7419a5aee9bd5fce67b7bfa8afe8e