summaryrefslogtreecommitdiff
path: root/Xtranstli.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:44 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:44 +0000
commite7743f4b397fae6fdf62f9a5980bdc8e89955fbf (patch)
tree7a793476296257883b264f68cb170e2675d7f4ed /Xtranstli.c
parentcd432af1694e321fd4cb65cd9b6aa877d59cf21d (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'Xtranstli.c')
-rw-r--r--Xtranstli.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xtranstli.c b/Xtranstli.c
index 9f686c4..d8b5db8 100644
--- a/Xtranstli.c
+++ b/Xtranstli.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.13 2003/08/26 15:38:39 tsi Exp $ */
+/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.12tsi Exp $ */
/* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
*