diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:31 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:31 +0000 |
| commit | f74e97735b36b4bc6dda432674f97781d959e17c (patch) | |
| tree | 6f9069788e4b6154d08c97e5fe4aa0a6b796d0ab /src/smi_video.c | |
| parent | 0dacf64dbb9bd733be1a524a68de25df92c13b0c (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 'src/smi_video.c')
| -rw-r--r-- | src/smi_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |