summaryrefslogtreecommitdiff
path: root/README
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 /README
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 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index d2f142d..60676f6 100644
--- a/README
+++ b/README
@@ -73,4 +73,4 @@ Debug:
Header: //Mercury/Projects/archives/XFree86/4.0/README.-arc 1.2 14 Sep 2000 12:28:36 Frido $
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/README,v 1.3 2001/02/15 18:20:33 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/README,v 1.2 2000/12/05 21:18:37 dawes Exp $