diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:10:39 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:10:39 +1000 |
| commit | c57195dc899ca732083487ed069ef813c340c0b5 (patch) | |
| tree | 63feeab824377985a8380f76c3b0e2e4165642c7 /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
| parent | 3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04 (diff) | |
| parent | 6b1a8129623e3716f2fc075608b260ce7c381fe2 (diff) | |
| download | qt4-tools-c57195dc899ca732083487ed069ef813c340c0b5.tar.gz | |
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 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions