projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a4f4c7 ed4d47f)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 16 Nov 2011 00:43:20 +0000 (10:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 16 Nov 2011 00:43:20 +0000 (10:43 +1000)
commit23f3c60c42ffc42acee823ba8041b9474cc15133
tree1145aee5be5e038f69f6fa04b8e1120255055e6etree | snapshot
parent7a4f4c7bbbee809186668a48cab025812a16d2accommit | diff
parented4d47fde11bf1bded55394358b19ceedb1d5768commit | 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:
  Add the ability to do unsafe SSL renegotiation as a fallback.
6b46b7419a5aee9bd5fce67b7bfa8afe8e