summaryrefslogtreecommitdiff
path: root/CALLMAP
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:31 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:31 +0000
commitf74e97735b36b4bc6dda432674f97781d959e17c (patch)
tree6f9069788e4b6154d08c97e5fe4aa0a6b796d0ab /CALLMAP
parent0dacf64dbb9bd733be1a524a68de25df92c13b0c (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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 'CALLMAP')
-rw-r--r--CALLMAP2
1 files changed, 1 insertions, 1 deletions
diff --git a/CALLMAP b/CALLMAP
index b7c9043..6410d18 100644
--- a/CALLMAP
+++ b/CALLMAP
@@ -19,4 +19,4 @@ ChipScreenInit
Header: \\Mercury\Projects\archives\XFree86 4.0\CALLMAP.-arc 1.1 13 Jul 2000 18:16:58 Frido $
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/CALLMAP,v 1.1 2000/11/28 20:59:18 dawes Exp $
+$XFree86$