summaryrefslogtreecommitdiff
path: root/Release.txt
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 /Release.txt
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 'Release.txt')
-rw-r--r--Release.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Release.txt b/Release.txt
index 204dba7..820d13a 100644
--- a/Release.txt
+++ b/Release.txt
@@ -228,4 +228,4 @@ frido@siliconmotion.com.
Header: //Mercury/Projects/archives/XFree86/4.0/Release.txt-arc 1.33 13 Dec 2000 09:52:48 Frido $
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Release.txt,v 1.7 2001/12/20 21:35:37 eich Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Release.txt,v 1.5 2001/02/15 18:20:33 dawes Exp $