summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-13 12:53:32 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-13 12:53:32 (GMT)
commit0f236d91fbca19838a71df025446725fea2ca87a (patch)
treedf27545d1341420b9fb30bb2e124a7f9c0a8cf04
parentedede3b20aa6ffdb16c790f7e537f5b8e9c96e68 (diff)
downloadQt-0f236d91fbca19838a71df025446725fea2ca87a.zip
Qt-0f236d91fbca19838a71df025446725fea2ca87a.tar.gz
Qt-0f236d91fbca19838a71df025446725fea2ca87a.tar.bz2
Fix broken merge of changes file.
Reviewed-by: Trust Me
-rw-r--r--dist/changes-4.6.04
1 files changed, 0 insertions, 4 deletions
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 7c97aa5..eaacdae 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -15,10 +15,6 @@ Qt Bug Tracker: http://bugreports.qt.nokia.com
Task Tracker: http://qt.nokia.com/developer/task-tracker
Merge Request: http://qt.gitorious.org
-QTBUG-1234 - Qt Bug Tracker: http://bugreports.qt.nokia.com
-MR#1234 - Merge Request: http://qt.gitorious.org
-123456 - Task Tracker: http://qt.nokia.com/developer/task-tracker
-
****************************************************************************
* General *
****************************************************************************