From f29b4da0f7342723dcfd65a40ea9c2bbbc2c3d42 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:44 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- src/vmwarexaa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vmwarexaa.c') diff --git a/src/vmwarexaa.c b/src/vmwarexaa.c index e39d14c..8142412 100644 --- a/src/vmwarexaa.c +++ b/src/vmwarexaa.c @@ -6,7 +6,7 @@ char rcsId_vmwarexaa[] = "Id: $"; #endif -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.6 2003/04/13 18:09:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.5 2003/02/04 01:39:53 dawes Exp $ */ #include "vmware.h" -- cgit v1.2.3