summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2010-04-23 14:08:48 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2010-04-23 14:08:48 (GMT)
commitfecce960a050ef2964e28f373bf1a35f7d9949a3 (patch)
tree296ef35071a80076a5186e71696cddc88cc1a56f /dist
parent02c65146610cdd5bfe1f3ee4656ba07af82afcc7 (diff)
parent15088d236924bccee787953e04214f87392e8e55 (diff)
downloadQt-fecce960a050ef2964e28f373bf1a35f7d9949a3.zip
Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.gz
Qt-fecce960a050ef2964e28f373bf1a35f7d9949a3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.4.02
-rw-r--r--dist/changes-4.7.06
2 files changed, 4 insertions, 4 deletions
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
index a33b510..3e7d14d 100644
--- a/dist/changes-4.4.0
+++ b/dist/changes-4.4.0
@@ -1999,7 +1999,7 @@ Qt for Embedded Linux
* Made the SL5000, USB, VR41xx and Yopy drivers available as plugins.
- Decoration drivers
- * Made the Styled, Windows and Default decorations avaiable as plugins
+ * Made the Styled, Windows and Default decorations available as plugins
- Demo applications
* Added embeddedsvgviewer, styledemo & fluidlauncher applications to
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index b9aa64d..d5b4672 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -8,11 +8,11 @@ The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
Some of the changes listed in this file include issue tracking numbers
-corresponding to tasks in the Task Tracker:
+corresponding to tasks in the Qt Bug Tracker:
- http://qt.nokia.com/developer/task-tracker
+ http://bugreports.qt.nokia.com/
-Each of these identifiers can be entered in the task tracker to obtain more
+Each of these identifiers can be entered in the bug tracker to obtain more
information about a particular change.
****************************************************************************