projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c82d701 35d9a12)
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>
Tue, 5 Apr 2011 22:13:11 +0000 (08:13 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Apr 2011 22:13:11 +0000 (08:13 +1000)
commitdc7385b41bf81e6c12dbd3c33c2bea577e067970
tree21524a53c3350f64805f55fa13b0d5a302c209d7tree | snapshot
parentc82d7010aa6c9cfa993e771f9953b70ae1fdb6a9commit | diff
parent35d9a12529a15d52432c858190ea520971402aaacommit | 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:
  Fixed license headers for examples in 4.7
  Removing extra comma in `enum' declaration.
  win32-g++: Correct the order of linked Windows libraries
  Remove SIGBUS emission from QNetworkSession destruction.
6b46b7419a5aee9bd5fce67b7bfa8afe8e