Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
authorBenjamin Poulain <benjamin.poulain@nokia.com>
Tue, 23 Feb 2010 17:45:41 +0000 (18:45 +0100)
committerBenjamin Poulain <benjamin.poulain@nokia.com>
Tue, 23 Feb 2010 17:45:41 +0000 (18:45 +0100)
commit615972e09981a0916422716b4f6572c6401789da
tree82203c15bceebd5426c823852ef5c85ad025e92b
parent60fd302e8d88b92ade59d68872c99310128c3a6c
parentde4332a4728e739b37e9c7b04c021e150e096270
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
src/corelib/corelib.pro
src/corelib/tools/qstring.cpp
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qdrawhelper_p.h