summaryrefslogtreecommitdiff
path: root/src/smi_dac.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:31 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:31 +0000
commitf74e97735b36b4bc6dda432674f97781d959e17c (patch)
tree6f9069788e4b6154d08c97e5fe4aa0a6b796d0ab /src/smi_dac.c
parent0dacf64dbb9bd733be1a524a68de25df92c13b0c (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_dac.c')
-rw-r--r--src/smi_dac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/smi_dac.c b/src/smi_dac.c
index 627b892..c606712 100644
--- a/src/smi_dac.c
+++ b/src/smi_dac.c
@@ -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_dac.c,v 1.2 2001/11/30 12:11:59 eich Exp $ */
+/* $XFree86$ */
#include "smi.h"