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/regsmi.h | |
| 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/regsmi.h')
| -rw-r--r-- | src/regsmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/regsmi.h b/src/regsmi.h index da0f659..d2dc840 100644 --- a/src/regsmi.h +++ b/src/regsmi.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/regsmi.h,v 1.3 2003/10/08 11:13:01 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/regsmi.h,v 1.1 2000/11/28 20:59:19 dawes Exp $ */ #ifndef _REGSMI_H #define _REGSMI_H |