summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-14 08:33:25 +0000
committerEgbert Eich <eich@suse.de>2004-03-14 08:33:25 +0000
commitf02d171b227e657f02a0b99a28cff7cbda21a583 (patch)
tree3f4c5b7c7969e7dc0a368e6535714e6313467378
parentd8072750f830173e3c9eefae8364d12190b20c26 (diff)
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1
-rw-r--r--man/mga.man2
-rw-r--r--src/binding.h2
-rw-r--r--src/mga.h2
-rw-r--r--src/mga_arc.c2
-rw-r--r--src/mga_common.h2
-rw-r--r--src/mga_dac3026.c2
-rw-r--r--src/mga_dacG.c2
-rw-r--r--src/mga_dga.c2
-rw-r--r--src/mga_dh.c2
-rw-r--r--src/mga_dri.c2
-rw-r--r--src/mga_dri.h2
-rw-r--r--src/mga_dripriv.h2
-rw-r--r--src/mga_driver.c2
-rw-r--r--src/mga_esc.c2
-rw-r--r--src/mga_g450pll.c2
-rw-r--r--src/mga_halmod.c2
-rw-r--r--src/mga_hwcurs.c2
-rw-r--r--src/mga_macros.h2
-rw-r--r--src/mga_map.h2
-rw-r--r--src/mga_merge.c2
-rw-r--r--src/mga_reg.h2
-rw-r--r--src/mga_sarea.h2
-rw-r--r--src/mga_shadow.c2
-rw-r--r--src/mga_storm.c2
-rw-r--r--src/mga_video.c2
-rw-r--r--src/mgareg_flags.h2
-rw-r--r--util/README2
-rw-r--r--util/stormdwg.c2
28 files changed, 28 insertions, 28 deletions
diff --git a/man/mga.man b/man/mga.man
index 28b9eed..0a1209d 100644
--- a/man/mga.man
+++ b/man/mga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.7 2003/04/03 07:11:03 herrb Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.8 2003/04/03 07:42:13 herrb Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH MGA __drivermansuffix__ __vendorversion__
diff --git a/src/binding.h b/src/binding.h
index 7fe7f68..f44de3e 100644
--- a/src/binding.h
+++ b/src/binding.h
@@ -13,7 +13,7 @@
@end
***************************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.3 2000/10/24 22:45:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.5 2000/12/06 20:39:52 dawes Exp $ */
#ifndef _BINDING
#define _BINDING
diff --git a/src/mga.h b/src/mga.h
index 38bea3d..2df66fc 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.87tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.88 2004/02/20 16:59:48 tsi Exp $ */
/*
* MGA Millennium (MGA2064W) functions
*
diff --git a/src/mga_arc.c b/src/mga_arc.c
index d282967..e75c246 100644
--- a/src/mga_arc.c
+++ b/src/mga_arc.c
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.12tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.13 2004/02/20 16:59:49 tsi Exp $ */
#include "X.h"
diff --git a/src/mga_common.h b/src/mga_common.h
index 6a3a83d..90f6b37 100644
--- a/src/mga_common.h
+++ b/src/mga_common.h
@@ -25,7 +25,7 @@
* Converted to common header format:
* Jens Owen <jens@tungstengraphics.com>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.1 2002/10/30 12:52:19 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $
*
*/
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c
index 7cbec19..57a464b 100644
--- a/src/mga_dac3026.c
+++ b/src/mga_dac3026.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dac3026.c,v 1.58tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dac3026.c,v 1.59 2004/02/20 16:59:49 tsi Exp $ */
/*
* Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
*
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index 0a3a7e2..bd004d9 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -2,7 +2,7 @@
* MGA-1064, MGA-G100, MGA-G200, MGA-G400, MGA-G550 RAMDAC driver
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c,v 1.54tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c,v 1.55 2004/02/20 16:59:49 tsi Exp $ */
/*
* This is a first cut at a non-accelerated version to work with the
diff --git a/src/mga_dga.c b/src/mga_dga.c
index 774aafd..3148fec 100644
--- a/src/mga_dga.c
+++ b/src/mga_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dga.c,v 1.14 1999/11/02 23:12:00 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dga.c,v 1.17 2003/10/08 15:48:41 eich Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/mga_dh.c b/src/mga_dh.c
index db4f4f2..e283795 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.5 2003/11/03 05:11:17 tsi Exp $ */
/*********************************************************************
* G450: This is for Dual Head.
* Matrox Graphics
diff --git a/src/mga_dri.c b/src/mga_dri.c
index 755c0db..e08a2a4 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.31tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.32 2003/11/06 18:38:04 tsi Exp $ */
/*
* Copyright 2000 VA Linux Systems Inc., Fremont, California.
diff --git a/src/mga_dri.h b/src/mga_dri.h
index fdd1272..b9ed1c2 100644
--- a/src/mga_dri.h
+++ b/src/mga_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.6 2001/04/10 16:08:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.8 2002/11/29 11:06:42 eich Exp $ */
/*
* Copyright 2000 VA Linux Systems Inc., Fremont, California.
diff --git a/src/mga_dripriv.h b/src/mga_dripriv.h
index ddd3aa7..3ddd133 100644
--- a/src/mga_dripriv.h
+++ b/src/mga_dripriv.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h,v 1.4 2001/04/10 16:08:01 dawes Exp $ */
/*
* Copyright 2000 VA Linux Systems Inc., Fremont, California.
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 7e45fc4..9afbb17 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -45,7 +45,7 @@
* Added digital screen option for first head
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v 1.244tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v 1.245 2004/02/20 16:59:49 tsi Exp $ */
/*
* This is a first cut at a non-accelerated version to work with the
diff --git a/src/mga_esc.c b/src/mga_esc.c
index 2478184..c813f8c 100644
--- a/src/mga_esc.c
+++ b/src/mga_esc.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_esc.c,v 1.3 2003/10/31 15:06:25 tsi Exp $ */
/****************************************************************************
* mga_esc.c
*
diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c
index 526d859..7abba9f 100644
--- a/src/mga_g450pll.c
+++ b/src/mga_g450pll.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_g450pll.c,v 1.8tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_g450pll.c,v 1.9 2003/11/03 05:11:18 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/mga_halmod.c b/src/mga_halmod.c
index a5bb425..4308f85 100644
--- a/src/mga_halmod.c
+++ b/src/mga_halmod.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_halmod.c,v 1.1 2000/12/06 15:35:21 eich Exp $ */
#include "xf86Module.h"
#ifdef XFree86LOADER
diff --git a/src/mga_hwcurs.c b/src/mga_hwcurs.c
index 50da1c5..8b4e66b 100644
--- a/src/mga_hwcurs.c
+++ b/src/mga_hwcurs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_hwcurs.c,v 1.8tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_hwcurs.c,v 1.9 1999/03/14 03:22:00 dawes Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/mga_macros.h b/src/mga_macros.h
index 9515879..d985081 100644
--- a/src/mga_macros.h
+++ b/src/mga_macros.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.22 2002/02/20 17:17:50 dawes Exp $ */
#ifndef _MGA_MACROS_H_
#define _MGA_MACROS_H_
diff --git a/src/mga_map.h b/src/mga_map.h
index 323e2a9..b41ca69 100644
--- a/src/mga_map.h
+++ b/src/mga_map.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_map.h,v 1.1 1997/03/06 23:16:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_map.h,v 1.2 2001/07/25 15:05:06 dawes Exp $ */
#if !defined(UNIXCPP) || defined(ANSICPP)
#define CATNAME(prefix,subname) prefix##subname
diff --git a/src/mga_merge.c b/src/mga_merge.c
index b06466c..ab3d20e 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.4 2003/09/24 02:43:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.5 2003/11/02 04:24:36 dawes Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/mga_reg.h b/src/mga_reg.h
index c5fe9c3..0d6a20b 100644
--- a/src/mga_reg.h
+++ b/src/mga_reg.h
@@ -2,7 +2,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.17 2001/04/25 14:23:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.18 2001/09/26 12:59:18 alanh Exp $ */
diff --git a/src/mga_sarea.h b/src/mga_sarea.h
index cb1c3e9..616dee5 100644
--- a/src/mga_sarea.h
+++ b/src/mga_sarea.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h,v 1.1 2001/03/21 17:11:47 dawes Exp $ */
/*
* Copyright 2000 Gareth Hughes
diff --git a/src/mga_shadow.c b/src/mga_shadow.c
index c3d8eea..b1c228b 100644
--- a/src/mga_shadow.c
+++ b/src/mga_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.3 2000/02/08 13:13:18 eich Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
diff --git a/src/mga_storm.c b/src/mga_storm.c
index aa14f6f..472421f 100644
--- a/src/mga_storm.c
+++ b/src/mga_storm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.99tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.100 2004/02/20 16:59:49 tsi Exp $ */
/* All drivers should typically include these */
diff --git a/src/mga_video.c b/src/mga_video.c
index 4b4afba..d76c7a5 100644
--- a/src/mga_video.c
+++ b/src/mga_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.33tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.34 2004/02/20 16:59:49 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/mgareg_flags.h b/src/mgareg_flags.h
index f45afbf..69050fc 100644
--- a/src/mgareg_flags.h
+++ b/src/mgareg_flags.h
@@ -19,7 +19,7 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mgareg_flags.h,v 1.2 2003/01/12 03:55:47 tsi Exp $ */
#ifndef _MGAREGS_H_
#define _MGAREGS_H_
diff --git a/util/README b/util/README
index e4863ff..9a87e53 100644
--- a/util/README
+++ b/util/README
@@ -22,4 +22,4 @@ ajv@greebo.net
-$XFree86: $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/util/README,v 1.2 1999/11/19 13:54:41 hohndel Exp $
diff --git a/util/stormdwg.c b/util/stormdwg.c
index d3707bc..e13916c 100644
--- a/util/stormdwg.c
+++ b/util/stormdwg.c
@@ -2,7 +2,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/dwg.c,v 1.1 1997/03/06 23:15:58 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/util/stormdwg.c,v 1.1 1997/04/12 14:11:29 hohndel Exp $ */
#include <stdio.h>
/* #include <stdlib.h> */