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

11 files changed, 11 insertions, 11 deletions

diff --git a/README.sgml b/README.sgml
index b8bd8cf..2ecbc3a 100644
--- a/README.sgml
+++ b/README.sgml
@@ -7,7 +7,7 @@
 <author>The XFree86 Project Inc.
 <date>3 November 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.6 2000/12/13 01:55:47 robin Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.5 2000/11/06 22:03:28 dawes Exp $
 </ident>
 
 <toc>
diff --git a/man/i128.man b/man/i128.man
index 4ba8b9b..24a1a4d 100644
--- a/man/i128.man
+++ b/man/i128.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.1 2001/01/24 00:06:19 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH I128 __drivermansuffix__ __vendorversion__
diff --git a/src/IBMRGB.h b/src/IBMRGB.h
index 9a36565..1eecbcb 100644
--- a/src/IBMRGB.h
+++ b/src/IBMRGB.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/IBMRGB.h,v 1.1 2000/10/04 23:34:58 robin Exp $ */
+/* $XFree86: $ */
 
 
 
diff --git a/src/Ti302X.h b/src/Ti302X.h
index a03835a..a03aa19 100644
--- a/src/Ti302X.h
+++ b/src/Ti302X.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/Ti302X.h,v 1.2 2001/03/03 22:26:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/Ti302X.h,v 1.1 2000/10/04 23:34:58 robin Exp $ */
 /*
  * Copyright 1994-2000 by Robin Cutshaw <robin@XFree86.Org>
  *
diff --git a/src/i128.h b/src/i128.h
index fd03ef7..a9430b4 100644
--- a/src/i128.h
+++ b/src/i128.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.h,v 1.6 2001/05/04 19:05:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.h,v 1.5 2001/04/01 14:00:11 tsi Exp $ */
 /*
  * Number Nine I128 functions
  *
diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c
index 972b2e8..f47ae0f 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.4 2003/11/06 18:38:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.3tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_ansic.h"
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 38d111d..b4b17df 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.35 2003/11/06 18:38:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.34tsi Exp $ */
 
 
 /* All drivers should typically include these */
diff --git a/src/i128accel.c b/src/i128accel.c
index d1a3bb4..4f87a57 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128accel.c,v 1.8 2003/02/17 16:08:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128accel.c,v 1.7 2000/12/06 01:07:34 robin Exp $ */
 
 /*
  * Copyright 1997-2000 by Robin Cutshaw <robin@XFree86.Org>
diff --git a/src/i128dga.c b/src/i128dga.c
index 3fb1132..97f4a6b 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128dga.c,v 1.4 2002/10/09 16:38:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128dga.c,v 1.3tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/i128init.c b/src/i128init.c
index 5702312..56d06d9 100644
--- a/src/i128init.c
+++ b/src/i128init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128init.c,v 1.6 2003/09/24 02:43:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128init.c,v 1.5 2000/11/03 00:50:53 robin Exp $ */
 /*
  * Copyright 1995-2000 by Robin Cutshaw <robin@XFree86.Org>
  * Copyright 1998 by Number Nine Visual Technology, Inc.
diff --git a/src/i128reg.h b/src/i128reg.h
index e96c24b..4b29d4e 100644
--- a/src/i128reg.h
+++ b/src/i128reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128reg.h,v 1.3 2002/01/25 21:56:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128reg.h,v 1.2 2000/10/23 14:11:39 robin Exp $ */
 /*
  * Copyright 1994 by Robin Cutshaw <robin@XFree86.Org>
  *