Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 10:26:33 +0000 (20:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 10:26:33 +0000 (20:26 +1000)
commitfde6021547b634dd7ee561af39668f39748befaf
tree8d191f0deb74b80d1c72e71df4564020f68817e1
parentc5d63be839e4560f4825d1740a4496abd945b4d6
parent051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Rename QGlyphs -> QGlyphRun