From 7935457063b78510e4c7335926b6e79fcf8a5864 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:31:08 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- README | 2 +- man/vmware.man | 2 +- src/bits2pixels.c | 2 +- src/bits2pixels.h | 2 +- src/guest_os.h | 2 +- src/includeCheck.h | 2 +- src/offscreen_manager.c | 2 +- src/offscreen_manager.h | 2 +- src/svga_limits.h | 2 +- src/svga_reg.h | 2 +- src/vm_basic_types.h | 2 +- src/vm_device_version.h | 2 +- src/vmware.c | 2 +- src/vmware.h | 2 +- src/vmwarecurs.c | 2 +- src/vmwarexaa.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README b/README index 883d311..d29cc1b 100644 --- a/README +++ b/README @@ -539,4 +539,4 @@ the first bits of the next scanline should use them. The bitmap data as a whole must be 4 byte aligned. -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.5 2002/10/16 22:12:53 alanh Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.2 2001/04/05 21:09:37 dawes Exp $ diff --git a/man/vmware.man b/man/vmware.man index e2d707f..efacc94 100644 --- a/man/vmware.man +++ b/man/vmware.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.man,v 1.2 2001/04/06 17:44:58 dawes Exp $ +.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VMWARE __drivermansuffix__ __vendorversion__ diff --git a/src/bits2pixels.c b/src/bits2pixels.c index 416a1a7..c08fa79 100644 --- a/src/bits2pixels.c +++ b/src/bits2pixels.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.1 2001/04/05 19:29:43 dawes Exp $ */ /* ********************************************************** * Copyright (C) 1999-2001 VMware, Inc. * All Rights Reserved diff --git a/src/bits2pixels.h b/src/bits2pixels.h index 585f6fc..a337902 100644 --- a/src/bits2pixels.h +++ b/src/bits2pixels.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */ /* ********************************************************** * Copyright (C) 1999-2001 VMware, Inc. * All Rights Reserved diff --git a/src/guest_os.h b/src/guest_os.h index dedebe0..96378f0 100644 --- a/src/guest_os.h +++ b/src/guest_os.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/guest_os.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */ +/* $XFree86$ */ /* ********************************************************* * Copyright (C) 1999-2001 VMware, Inc. * All Rights Reserved diff --git a/src/includeCheck.h b/src/includeCheck.h index 8df4666..5d02f03 100644 --- a/src/includeCheck.h +++ b/src/includeCheck.h @@ -1,3 +1,3 @@ /* This space intentionally left blank. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.3 2002/10/16 22:12:53 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.2 2001/04/06 17:44:58 dawes Exp $ */ diff --git a/src/offscreen_manager.c b/src/offscreen_manager.c index 68c8632..c2a7a0d 100644 --- a/src/offscreen_manager.c +++ b/src/offscreen_manager.c @@ -2,7 +2,7 @@ * Copyright (C) 1998-2002 VMware, Inc. * All Rights Reserved * **********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.1 2002/12/10 04:17:19 dawes Exp $ */ #include "vmware.h" diff --git a/src/offscreen_manager.h b/src/offscreen_manager.h index e948da9..27d97a7 100644 --- a/src/offscreen_manager.h +++ b/src/offscreen_manager.h @@ -2,7 +2,7 @@ * Copyright (C) 1998-2002 VMware, Inc. * All Rights Reserved * **********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.1 2002/12/10 04:17:19 dawes Exp $ */ #ifndef OFFSCREEN_MANAGER_H #define OFFSCREEN_MANAGER_H diff --git a/src/svga_limits.h b/src/svga_limits.h index 016c2b8..209dd8f 100644 --- a/src/svga_limits.h +++ b/src/svga_limits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.2 2002/10/16 22:12:53 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */ /* ********************************************************** * Copyright (C) 1998-2001 VMware, Inc. * All Rights Reserved diff --git a/src/svga_reg.h b/src/svga_reg.h index 2d6800d..d68666c 100644 --- a/src/svga_reg.h +++ b/src/svga_reg.h @@ -9,7 +9,7 @@ * * SVGA hardware definitions */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.8 2003/02/04 01:39:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.7 2002/12/10 04:17:19 dawes Exp $ */ #ifndef _SVGA_REG_H_ #define _SVGA_REG_H_ diff --git a/src/vm_basic_types.h b/src/vm_basic_types.h index 673522f..703e217 100644 --- a/src/vm_basic_types.h +++ b/src/vm_basic_types.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.5 2002/01/07 20:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.4 2001/04/25 16:44:58 tsi Exp $ */ /* ********************************************************** * Copyright (C) 1998-2001 VMware, Inc. * All Rights Reserved diff --git a/src/vm_device_version.h b/src/vm_device_version.h index 8f6dd3b..f7af959 100644 --- a/src/vm_device_version.h +++ b/src/vm_device_version.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_device_version.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */ +/* $XFree86$ */ /* ********************************************************** * Copyright (C) 1998-2001 VMware, Inc. * All Rights Reserved diff --git a/src/vmware.c b/src/vmware.c index b5cbaf9..76d4bc3 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -6,7 +6,7 @@ char rcsId_vmware[] = "Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $"; #endif -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.19 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.18 2003/09/24 02:43:31 dawes Exp $ */ /* * TODO: support the vmware linux kernel fb driver (Option "UseFBDev"). diff --git a/src/vmware.h b/src/vmware.h index 82fec25..7be49d5 100644 --- a/src/vmware.h +++ b/src/vmware.h @@ -3,7 +3,7 @@ * All Rights Reserved * Id: vmware.h,v 1.6 2001/01/30 18:13:47 bennett Exp $ * **********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.h,v 1.12 2003/11/17 22:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.h,v 1.11 2003/04/13 18:09:27 dawes Exp $ */ #ifndef VMWARE_H #define VMWARE_H diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c index 1a7c6eb..23ddc59 100644 --- a/src/vmwarecurs.c +++ b/src/vmwarecurs.c @@ -6,7 +6,7 @@ char rcsId_vmwarecurs[] = "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $"; #endif -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.11 2003/02/05 12:47:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.10 2003/02/04 01:39:53 dawes Exp $ */ #include "vmware.h" #include "bits2pixels.h" 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