projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03a6cb0 462f514)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 22 Dec 2010 16:11:37 +0000 (02:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 22 Dec 2010 16:11:37 +0000 (02:11 +1000)
commitbe8ad40ff0594118a5f5a883fcfff35e28c21a30
tree19e737407a2912c645168b1ff287225e6f80e5b7tree | snapshot
parent03a6cb097a68f12a4169549cc6b83a09549d267fcommit | diff
parent462f5148a3be5835cc8d5b69685473042789c917commit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix infinite loop in qmake when reading malformed .ts files.
  Fix libinfixed usage in Symbian when def files are used
6b46b7419a5aee9bd5fce67b7bfa8afe8e