Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Nov 2010 10:18:14 +0000 (11:18 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Nov 2010 10:18:14 +0000 (11:18 +0100)
commite68210d2086fbdc8252298f8d7781bf84f73b6ab
treea065683fe2abd91d4127f320d85140099dd56281
parent03c2fb7e9c39b433232fb6a18881cd8419d8237b
parent0bf8f70f85a24ab2864775bdd38f5ced43a7d4de
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QLocalSocket/Win: do not emit error() when no error actually occurred
  Doc: fix typo