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.h | |
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.h')
-rw-r--r-- | src/smi_video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/smi_video.h b/src/smi_video.h index b63e4bc..270e0fe 100644 --- a/src/smi_video.h +++ b/src/smi_video.h @@ -26,7 +26,7 @@ Silicon Motion shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the XFree86 Project and silicon Motion. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.h,v 1.4 2002/09/16 18:06:01 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.h,v 1.1 2000/11/28 20:59:20 dawes Exp $ */ #ifndef _SMI_VIDEO_H #define _SMI_VIDEO_H |