Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorGunnar Sletta <gunnar@trolltech.com>
Fri, 18 Sep 2009 10:39:47 +0000 (12:39 +0200)
committerGunnar Sletta <gunnar@trolltech.com>
Fri, 18 Sep 2009 10:39:47 +0000 (12:39 +0200)
commitc1db7b5d8b7fb68b12c992cfa1953a599913851c
treed89826eb3d5ae0de3aac63f8e80f193c2baea0b2
parentdd3e430897a222ee9e3c7b923d094401fdeb72dd
parent6bd75e56853acce0b9d9fcc6fc162c546d217ab0
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
src/gui/painting/qpainter.cpp