From c7bb5f0b917b82aed4203df3be0585be82077d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 27 May 2014 01:39:46 +0200 Subject: Branding cleanup on Debian and Ubuntu --- ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml') diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml index 6eaa4064f..eaf1d947e 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml +++ b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml @@ -64,7 +64,7 @@ manpage.1: manpage.sgml &dhpackage; - + @@ -90,7 +90,7 @@ manpage.1: manpage.sgml provides an automatic merge-facility and an integrated editor for comfortable solving of merge-conflicts supports Unicode, UTF-8 and other codecs - supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) + supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.) Printing of differences Manual alignment of lines Automatic merging of version control history ($Log$) -- cgit v1.2.1