diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:53 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:53 +0000 |
commit | dd3940023d89cd833123d1ef8985bcb28e006934 (patch) | |
tree | d38396938bbbf5bd7a579ff4e94269e38b46ce67 /src/smi_video.c | |
parent | 0dacf64dbb9bd733be1a524a68de25df92c13b0c (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/smi_video.c')
-rw-r--r-- | src/smi_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/smi_video.c b/src/smi_video.c index ea950a0..441af51 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -41,8 +41,8 @@ Author of changes: Corvin Zahn <zahn@zac.de> 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 $ */ +: /* $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.13 2003/11/10 18:22:26 tsi Exp $ */ #include "smi.h" #include "smi_video.h" |