From f74e97735b36b4bc6dda432674f97781d959e17c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:31 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- src/smi_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/smi_video.c') diff --git a/src/smi_video.c b/src/smi_video.c index ea950a0..3bc4f8b 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -42,7 +42,7 @@ Date: 2.11.2001 */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.14 2003/12/08 16:03:58 alanh Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.14 2003/12/08 16:03:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */ #include "smi.h" #include "smi_video.h" -- cgit v1.2.3