From dbc4ab662f67ce0cf1ea877cac01a5e0ea6dab0c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:35 +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/suncg3.man | 2 +- src/cg3.h | 2 +- src/cg3_driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/suncg3.man b/man/suncg3.man index 8c1c8f1..cdc4ecc 100644 --- a/man/suncg3.man +++ b/man/suncg3.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG3 __drivermansuffix__ __vendorversion__ diff --git a/src/cg3.h b/src/cg3.h index c2efa94..3490f34 100644 --- a/src/cg3.h +++ b/src/cg3.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */ +/* $XFree86:$ */ #ifndef CG3_H #define CG3_H diff --git a/src/cg3_driver.c b/src/cg3_driver.c index dd5ef49..8bf3815 100644 --- a/src/cg3_driver.c +++ b/src/cg3_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */ #define PSZ 8 #include "xf86.h" -- cgit v1.2.3