diff options
author | Pawel "l0ner" Soltys <[email protected]> | 2012-01-31 20:55:33 +0100 |
---|---|---|
committer | Pawel "l0ner" Soltys <[email protected]> | 2012-01-31 20:55:33 +0100 |
commit | 6fe06aaabf3add9d0c18b151dd56e9fa97ee45e9 (patch) | |
tree | c881ae9a7d1de31f1a80dc9d80b055da26633dda /ubuntu/maverick_automake/kde-i18n/debian/changelog | |
parent | 01b8500f8a92bbc7c12fb42351fc901dca3ab13a (diff) | |
parent | 487cb648a65392c0e2f409a83e8ba7d37d6e04cd (diff) | |
download | tde-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_automake/kde-i18n/debian/changelog')
-rw-r--r-- | ubuntu/maverick_automake/kde-i18n/debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick_automake/kde-i18n/debian/changelog b/ubuntu/maverick_automake/kde-i18n/debian/changelog index 2150d4236..b4a427061 100644 --- a/ubuntu/maverick_automake/kde-i18n/debian/changelog +++ b/ubuntu/maverick_automake/kde-i18n/debian/changelog @@ -300,7 +300,7 @@ kde-i18n (4:3.2.2-3) unstable; urgency=low kde-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 kdevelop-data (kdevelop version 2) because kdevelop version 3 translations are included in kde-i18n |