diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 13:11:08 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 13:11:08 +0100 |
| commit | 90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475 (patch) | |
| tree | a519424035cdbd92d665c748ffa6ecfa8d553f3b /dist | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | 02d1a0422c42889813bb2586503aff43a3509e09 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/gui/styles/qs60style_s60.cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.5.4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dist/changes-4.5.4 b/dist/changes-4.5.4 index e60e5074e1..ac91edb138 100644 --- a/dist/changes-4.5.4 +++ b/dist/changes-4.5.4 @@ -9,12 +9,12 @@ The Qt version 4.5 series is binary compatible with the 4.4.x series. Applications compiled for 4.4 will continue to run with 4.5. 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, the (now obsolete) Task +Tracker, or the Merge Request queue of the public source repository. - http://qt.nokia.com/developer/task-tracker - -Each of these identifiers can be entered in the task tracker to obtain more -information about a particular change. +Qt Bug Tracker: http://bugreports.qt.nokia.com +Task Tracker: http://qt.nokia.com/developer/task-tracker +Merge Request: http://qt.gitorious.org **************************************************************************** * General * |