23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES

    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).

12 files changed, 12 insertions, 12 deletions

diff --git a/README.sgml b/README.sgml
index 3dba59b..d9936a7 100644
--- a/README.sgml
+++ b/README.sgml
@@ -8,7 +8,7 @@
 <date>March 5th, 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 22:59:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.8 1999/07/19 13:36:20 dawes Exp $
 </ident>
 
 <toc>
diff --git a/src/BT463ramdac.c b/src/BT463ramdac.c
index 44d1f24..c48aead 100644
--- a/src/BT463ramdac.c
+++ b/src/BT463ramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BT463ramdac.c,v 1.1 1998/08/29 05:43:34 dawes Exp $ */
+/* $XFree86$ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/BTramdac.c b/src/BTramdac.c
index c2aa06a..52828c7 100644
--- a/src/BTramdac.c
+++ b/src/BTramdac.c
@@ -24,7 +24,7 @@
  * tgaBTOutIndReg() and tgaBTInIndReg() are used to access 
  * the indirect TGA BT RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BTramdac.c,v 1.5 2000/10/20 12:57:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BTramdac.c,v 1.4 1999/02/07 11:11:14 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/IBM561ramdac.c b/src/IBM561ramdac.c
index c67850a..11aebc7 100644
--- a/src/IBM561ramdac.c
+++ b/src/IBM561ramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.4 2003/09/24 02:43:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.3 2001/02/15 11:03:58 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/ICS1562.c b/src/ICS1562.c
index ac72b24..fb3f40e 100644
--- a/src/ICS1562.c
+++ b/src/ICS1562.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/ICS1562.c,v 1.3 1999/04/17 07:06:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/ICS1562.c,v 1.2 1998/07/25 16:55:56 dawes Exp $ */
 
 #define BASE_FREQ 14.31818
 #define MAX_FREQ 230000
diff --git a/src/tga.h b/src/tga.h
index 7246511..4c60606 100644
--- a/src/tga.h
+++ b/src/tga.h
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga.h,v 1.18 2001/11/21 22:32:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga.h,v 1.17 2001/05/04 19:05:47 dawes Exp $ */
 
 #ifndef _TGA_H_
 #define _TGA_H_
diff --git a/src/tga_accel.c b/src/tga_accel.c
index 7d1c9dc..433a002 100644
--- a/src/tga_accel.c
+++ b/src/tga_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.16 2003/09/24 02:43:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.15 2001/11/21 22:32:59 alanh Exp $ */
 
 /*
  * Copyright 1996,1997 by Alan Hourihane, Wigan, England.
diff --git a/src/tga_cursor.c b/src/tga_cursor.c
index 1c2d359..9b89a70 100644
--- a/src/tga_cursor.c
+++ b/src/tga_cursor.c
@@ -25,7 +25,7 @@
  * 
  * DEC TGA hardware cursor using BT485 ramdac
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_cursor.c,v 1.2 2000/10/20 12:57:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_cursor.c,v 1.1 1999/04/17 07:06:58 dawes Exp $ */
 
 
 /* tga_cursor.c */
diff --git a/src/tga_dac.c b/src/tga_dac.c
index ec5f866..03b0247 100644
--- a/src/tga_dac.c
+++ b/src/tga_dac.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_dac.c,v 1.14 2001/10/28 03:33:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_dac.c,v 1.13 2001/02/17 14:18:30 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tga_driver.c b/src/tga_driver.c
index baa0413..7c49375 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -22,7 +22,7 @@
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  *           Matthew Grossman, <mattg@oz.net> - acceleration and misc fixes
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.61 2003/11/03 05:11:41 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.60tsi Exp $ */
 
 /* everybody includes these */
 #include "xf86.h"
diff --git a/src/tga_line.c b/src/tga_line.c
index b1a510c..3d1696d 100644
--- a/src/tga_line.c
+++ b/src/tga_line.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_line.c,v 1.2 1999/12/16 02:26:30 robin Exp $ */
+/* $XFree86: $ */
 
 /*
  * Copyright 1999 by Matthew Grossman, Seattle, USA.
diff --git a/src/tga_regs.h b/src/tga_regs.h
index 4bda04a..9e33a53 100644
--- a/src/tga_regs.h
+++ b/src/tga_regs.h
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.12 2002/05/13 05:22:37 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.11 2000/10/20 12:57:26 alanh Exp $ */
 
 /* TGA hardware description (minimal)
  *