summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tde-i18n
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-31 20:55:33 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-31 20:55:33 +0100
commit6fe06aaabf3add9d0c18b151dd56e9fa97ee45e9 (patch)
treec881ae9a7d1de31f1a80dc9d80b055da26633dda /ubuntu/maverick/tde-i18n
parent01b8500f8a92bbc7c12fb42351fc901dca3ab13a (diff)
parent487cb648a65392c0e2f409a83e8ba7d37d6e04cd (diff)
downloadtde-packaging-6fe06aaabf3add9d0c18b151dd56e9fa97ee45e9.tar.gz
tde-packaging-6fe06aaabf3add9d0c18b151dd56e9fa97ee45e9.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tde-i18n')
-rw-r--r--ubuntu/maverick/tde-i18n/debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/tde-i18n/debian/changelog b/ubuntu/maverick/tde-i18n/debian/changelog
index 1b8e2c2ba..7862961e0 100644
--- a/ubuntu/maverick/tde-i18n/debian/changelog
+++ b/ubuntu/maverick/tde-i18n/debian/changelog
@@ -300,7 +300,7 @@ tde-i18n (4:3.2.2-3) unstable; urgency=low
tde-i18n (4:3.2.2-2) unstable; urgency=low
- * corrected juk and kcachegrind conflict to <<4:3.2.1-1
+ * corrected juk and tdecachegrind conflict to <<4:3.2.1-1
* conflicting with tdevelop-data (tdevelop version 2)
because tdevelop version 3 translations are included in
tde-i18n