Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 08:54:44 +0000 (18:54 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 08:54:44 +0000 (18:54 +1000)
commitc31a354bd192bfd24b0ba88add439347ac73659c
tree5a0f8fee94b4d478d7d8c3eaa5d1574ece2d90ca
parentc6b4da2f8a86d82cc560deef1027f28dcf728ec3
parent1f806aa1b40db276dad359863d018171080d93f9
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  New algorithm for drawing thin lines