diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 11:45:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 11:45:44 (GMT) |
| commit | 5a9000c3aca05e28c4fc537f82d85d6ec4395dc5 (patch) | |
| tree | 4114322dbbce087f33d4939f63f875ca06e7d9aa /src/gui/text/qfontdatabase_s60.cpp | |
| parent | b2087b22f4d6b60ae0dae4757c2c444ff9d3ac63 (diff) | |
| parent | 35d3cd9e56e2c8fd84b2ea94bd12e01d7890fab9 (diff) | |
| download | Qt-5a9000c3aca05e28c4fc537f82d85d6ec4395dc5.zip Qt-5a9000c3aca05e28c4fc537f82d85d6ec4395dc5.tar.gz Qt-5a9000c3aca05e28c4fc537f82d85d6ec4395dc5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslCertificate: blacklist fraudulent *.google.com
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
0 files changed, 0 insertions, 0 deletions