From 98833982edb487c2e22a7f2fad8fbe4316d6b51e Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:30:38 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- man/cirrus.man | 2 +- src/CirrusClk.c | 2 +- src/alp.h | 2 +- src/alp_driver.c | 2 +- src/alp_hwcurs.c | 2 +- src/alp_i2c.c | 2 +- src/alp_xaa.c | 2 +- src/alp_xaam.c | 2 +- src/cir.h | 2 +- src/cir_dga.c | 2 +- src/cir_driver.c | 2 +- src/cir_shadow.c | 2 +- src/lg.h | 2 +- src/lg_driver.c | 2 +- src/lg_hwcurs.c | 2 +- src/lg_i2c.c | 2 +- src/lg_xaa.c | 2 +- src/lg_xaa.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/man/cirrus.man b/man/cirrus.man index 5035b02..476bd80 100644 --- a/man/cirrus.man +++ b/man/cirrus.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.1 2001/01/24 00:06:17 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH CIRRUS __drivermansuffix__ __vendorversion__ diff --git a/src/CirrusClk.c b/src/CirrusClk.c index c548f1f..e3388df 100644 --- a/src/CirrusClk.c +++ b/src/CirrusClk.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.9 1999/12/26 18:24:14 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */ /* * Programming of the built-in Cirrus clock generator. diff --git a/src/alp.h b/src/alp.h index 01c5301..2eadc24 100644 --- a/src/alp.h +++ b/src/alp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.6 2001/02/15 17:39:28 eich Exp $ */ /* (c) Itai Nahshon */ diff --git a/src/alp_driver.c b/src/alp_driver.c index c4533c0..547c983 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -11,7 +11,7 @@ * Guy DESBIEF */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.36 2003/11/07 22:49:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */ /* All drivers should typically include these */ #include "xf86.h" diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c index a4f0581..002098f 100644 --- a/src/alp_hwcurs.c +++ b/src/alp_hwcurs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */ /* (c) Itai Nahshon */ diff --git a/src/alp_i2c.c b/src/alp_i2c.c index 78d5406..ba80065 100644 --- a/src/alp_i2c.c +++ b/src/alp_i2c.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.3 2000/12/06 15:35:15 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/alp_xaa.c b/src/alp_xaa.c index 417f816..bbdf735 100644 --- a/src/alp_xaa.c +++ b/src/alp_xaa.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.8 2002/01/25 21:56:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/alp_xaam.c b/src/alp_xaam.c index 2f25092..5b4ab25 100644 --- a/src/alp_xaam.c +++ b/src/alp_xaam.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ /* #define DEBUG */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.8 2002/07/10 02:36:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/cir.h b/src/cir.h index 536f7aa..2000c68 100644 --- a/src/cir.h +++ b/src/cir.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.21 2002/01/25 21:56:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */ /* (c) Itai Nahshon */ diff --git a/src/cir_dga.c b/src/cir_dga.c index 7677160..6f31084 100644 --- a/src/cir_dga.c +++ b/src/cir_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */ /* * Copyright 2000 by Egbert Eich * diff --git a/src/cir_driver.c b/src/cir_driver.c index 737eb3f..e8a80e5 100644 --- a/src/cir_driver.c +++ b/src/cir_driver.c @@ -11,7 +11,7 @@ * Guy DESBIEF */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.69 2003/06/18 16:17:38 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */ /* All drivers should typically include these */ #include "xf86.h" diff --git a/src/cir_shadow.c b/src/cir_shadow.c index 184dee8..1c529eb 100644 --- a/src/cir_shadow.c +++ b/src/cir_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_shadow.c,v 1.1 2000/02/08 13:13:14 eich Exp $ */ +/* $XFree86: Exp $ */ /* Copyright (c) 1999,2000 The XFree86 Project Inc. diff --git a/src/lg.h b/src/lg.h index 9d91053..09285a4 100644 --- a/src/lg.h +++ b/src/lg.h @@ -10,7 +10,7 @@ * Inspired by cir.h */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.11 2000/12/06 15:35:16 eich Exp $ */ #ifndef LG_H #define LG_H diff --git a/src/lg_driver.c b/src/lg_driver.c index 90eee02..507f5d1 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -13,7 +13,7 @@ * David Dawes, Andrew E. Mileski, Leonard N. Zubkoff, * Guy DESBIEF, Itai Nahshon. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.50 2003/11/07 22:49:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */ #define EXPERIMENTAL diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c index 7e30bdb..2f3101d 100644 --- a/src/lg_hwcurs.c +++ b/src/lg_hwcurs.c @@ -10,7 +10,7 @@ * Much of this code is inspired by the HW cursor code from XFree86 * 3.3.3. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/lg_i2c.c b/src/lg_i2c.c index 6cb3e3d..7f5ee4e 100644 --- a/src/lg_i2c.c +++ b/src/lg_i2c.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/lg_xaa.c b/src/lg_xaa.c index 9488721..7b84b6b 100644 --- a/src/lg_xaa.c +++ b/src/lg_xaa.c @@ -10,7 +10,7 @@ * Much of this code is inspired by the XAA acceleration from XFree86 * 3.3.3, laguna_acl.c */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.5 2001/02/15 17:39:28 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/lg_xaa.h b/src/lg_xaa.h index 7359a49..b115dc8 100644 --- a/src/lg_xaa.h +++ b/src/lg_xaa.h @@ -13,7 +13,7 @@ * This header file draws much from the file cir_blitLG.h in version 3.3.3 * of XFree86. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.1 1998/11/22 10:37:21 dawes Exp $ */ /* This header file defines the necessary structures, contstants, and variables for using the bitBLT engine on a Laguna family graphics -- cgit v1.2.3