summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 12:46:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 12:46:30 +0000
commitb2296c79c63b140e99e01a11b769b46238c539d3 (patch)
treeb0cb8d1825c85013e38d1e0417d0d6f89d2a5f16
parentea8c1785679cf97d6b5ab65b16143faca702bbf0 (diff)
broken script that automatically removed spurious conflitcs do to CVS tag mismatches. The 'XdotOrg' tag really haunts me!
-rw-r--r--iso8859-6.16.enc2
-rw-r--r--iso8859-6.8x.enc2
2 files changed, 2 insertions, 2 deletions
diff --git a/iso8859-6.16.enc b/iso8859-6.16.enc
index 0b55300..6d3f846 100644
--- a/iso8859-6.16.enc
+++ b/iso8859-6.16.enc
@@ -7,7 +7,7 @@ STARTENCODING iso8859-6.16
# - http://www.langbox.com/arabic/FontSet_ISO8859-6-16.html
# - http://bugs.xfree86.org/show_bug.cgi?id=420
# - http://bugzilla.mozilla.org/show_bug.cgi?id=78201
-: # $XdotOrg: xc/fonts/encodings/iso8859-6.16.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $
+# $XdotOrg: xc/fonts/encodings/iso8859-6.16.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $
# $XFree86$
STARTMAPPING unicode
UNDEFINE 0x0000 0xFFFF
diff --git a/iso8859-6.8x.enc b/iso8859-6.8x.enc
index 5ab5ad1..b900f2f 100644
--- a/iso8859-6.8x.enc
+++ b/iso8859-6.8x.enc
@@ -7,7 +7,7 @@ STARTENCODING iso8859-6.8x
# - http://www.langbox.com/arabic/FontSet_ISO8859-6-8X.html
# - http://bugs.xfree86.org/show_bug.cgi?id=420
# - http://bugzilla.mozilla.org/show_bug.cgi?id=78201
-: # $XdotOrg: xc/fonts/encodings/iso8859-6.8x.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $
+# $XdotOrg: xc/fonts/encodings/iso8859-6.8x.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $
# $XFree86$
STARTMAPPING unicode
UNDEFINE 0x0000 0xFFFF