From 3a36059c0db40b81f73f6e86d7849066ee77e35e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:39 +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). --- man/vesa.man | 2 +- src/vesa.c | 2 +- src/vesa.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/vesa.man b/man/vesa.man index 5a9dfd5..1a4bbef 100644 --- a/man/vesa.man +++ b/man/vesa.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.3 2001/12/17 20:52:34 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VESA __drivermansuffix__ __vendorversion__ diff --git a/src/vesa.c b/src/vesa.c index 86eb228..f37318b 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -28,7 +28,7 @@ * Authors: Paulo César Pereira de Andrade * David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v 1.41 2003/11/07 22:50:57 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v 1.40 2003/11/03 05:11:45 tsi Exp $ */ #include "vesa.h" diff --git a/src/vesa.h b/src/vesa.h index cc448eb..78b9e1e 100644 --- a/src/vesa.h +++ b/src/vesa.h @@ -26,7 +26,7 @@ * * Authors: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.14 2003/01/16 16:09:10 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $ */ #ifndef _VESA_H_ -- cgit v1.2.3