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

13 files changed, 13 insertions, 13 deletions

diff --git a/man/tseng.man b/man/tseng.man
index e410207..ef76408 100644
--- a/man/tseng.man
+++ b/man/tseng.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.1 2001/01/24 00:06:32 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH TSENG __drivermansuffix__ __vendorversion__
diff --git a/src/README b/src/README
index dca1c6b..56ad83e 100644
--- a/src/README
+++ b/src/README
@@ -261,4 +261,4 @@ the off-screen scanline buffers and calling the Subsequent() function.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/README,v 1.12 2000/08/08 08:58:06 eich Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/README,v 1.7.2.1 1998/07/24 11:36:28 dawes Exp $
diff --git a/src/tseng.h b/src/tseng.h
index e022b4b..1371baa 100644
--- a/src/tseng.h
+++ b/src/tseng.h
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.38 2003/11/03 05:11:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.37tsi Exp $ */
 
 
 
diff --git a/src/tseng_accel.c b/src/tseng_accel.c
index ace484c..c3cd170 100644
--- a/src/tseng_accel.c
+++ b/src/tseng_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_accel.c,v 1.33 2001/02/15 17:54:55 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_accel.c,v 1.29 1999/06/12 07:18:57 dawes Exp $ */
 
 /*
  * ET4/6K acceleration interface.
diff --git a/src/tseng_acl.c b/src/tseng_acl.c
index 9a62e4e..319fbfa 100644
--- a/src/tseng_acl.c
+++ b/src/tseng_acl.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.c,v 1.25 2000/12/14 16:33:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.c,v 1.23 2000/08/08 08:58:06 eich Exp $ */
 
 
 
diff --git a/src/tseng_acl.h b/src/tseng_acl.h
index b7ca4b3..9402d58 100644
--- a/src/tseng_acl.h
+++ b/src/tseng_acl.h
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.h,v 1.20 2000/12/14 16:33:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.h,v 1.16 1998/08/29 05:43:37 dawes Exp $ */
 
 
 #ifndef _TSENG_ACL_H
diff --git a/src/tseng_bank.c b/src/tseng_bank.c
index e0d6136..c872e70 100644
--- a/src/tseng_bank.c
+++ b/src/tseng_bank.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_bank.c,v 1.4 2000/08/08 08:58:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_bank.c,v 1.2 1998/07/26 09:56:17 dawes Exp $ */
 
 
 
diff --git a/src/tseng_colexp.c b/src/tseng_colexp.c
index 9c471a9..c946e30 100644
--- a/src/tseng_colexp.c
+++ b/src/tseng_colexp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_colexp.c,v 1.14 2001/02/15 17:54:55 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_colexp.c,v 1.12 2000/08/08 08:58:06 eich Exp $ */
 
 
 
diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
index 199082b..25a9b25 100644
--- a/src/tseng_cursor.c
+++ b/src/tseng_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_cursor.c,v 1.17 2001/05/07 21:59:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_cursor.c,v 1.16 2000/09/19 12:46:19 eich Exp $ */
 
 
 
diff --git a/src/tseng_dga.c b/src/tseng_dga.c
index 4623f08..b98887a 100644
--- a/src/tseng_dga.c
+++ b/src/tseng_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dga.c,v 1.2 2001/10/01 13:44:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dga.c,v 1.1 2000/12/06 15:35:24 eich Exp $ */
 /*
  * Copyright 2000 by Rainer Keller, <Rainer.Keller@studmail.uni-stuttgart.de>.
  *
diff --git a/src/tseng_dpms.c b/src/tseng_dpms.c
index c1e2113..1361995 100644
--- a/src/tseng_dpms.c
+++ b/src/tseng_dpms.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dpms.c,v 1.10 2001/01/21 21:19:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dpms.c,v 1.9 2000/08/08 08:58:06 eich Exp $ */
 
 
 
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 7a23993..588ab4f 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.98 2003/11/03 05:11:44 tsi Exp $ 
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.97tsi Exp $ 
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
diff --git a/src/tseng_inline.h b/src/tseng_inline.h
index bc2ba77..5f6055d 100644
--- a/src/tseng_inline.h
+++ b/src/tseng_inline.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_inline.h,v 1.8 2000/08/08 08:58:07 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_inline.h,v 1.5 1998/07/25 16:56:03 dawes Exp $ */
 
 #include "tseng.h"