projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a986d6 9615608)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 5 Nov 2010 05:13:42 +0000 (06:13 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 5 Nov 2010 05:13:42 +0000 (06:13 +0100)
commitc791b300b288635ed018d50c5e6e28859b374b5e
treed2e1c82246fd860a82062bd11df06d4d984fc9e9tree | snapshot
parent8a986d6fc4f0b87eda4f4f364cac6b39bbce5896commit | diff
parent9615608afa7e0a62d1a444b699f40aeeaeaf41decommit | diff
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:
  Fix opening a network session multiple times in succession.
  Fix synchronous dispatch in ICD in non-main threads.
  Russian translation update
  QNAM HTTP: Download last chunk properly when readBufferSize() limited
  Prevent access to non-existent memory in QGL2PEXVertexArray
  Prevent excessive seeks in xbm detection
6b46b7419a5aee9bd5fce67b7bfa8afe8e