summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 07:10:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 07:10:21 (GMT)
commitc4a8f59a18132da71615f92eb406e1a759d96b18 (patch)
treea5a0580c7bf94a386633c7f930c6a2c1a69ad7f7 /dist
parentbf6d391a12f2adfac81ec4eaa2ee50452d7ce6b1 (diff)
parentd98c38aacd14daf4aa202fa3d24ea67caf184652 (diff)
downloadQt-c4a8f59a18132da71615f92eb406e1a759d96b18.zip
Qt-c4a8f59a18132da71615f92eb406e1a759d96b18.tar.gz
Qt-c4a8f59a18132da71615f92eb406e1a759d96b18.tar.bz2
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: Typo.
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.6.32
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index 08db0bb..9383600 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -107,7 +107,7 @@ QtGui
* [QTBUG-8606] Fixed QPixmap::load() to not modify referenced copies.
- QPainter
- * [QTBUG-8140] Speed up custom bitmap bruses under X11 without Xrender support.
+ * [QTBUG-8140] Speed up custom bitmap brushes under X11 without Xrender support.
* [QTBUG-8032] Fixed drawing pixmaps onto bitmaps on X11 without Xrender support.
- QImageReader