23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-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).

4 files changed, 4 insertions, 4 deletions

diff --git a/xf86dga.h b/xf86dga.h
index c0c2b7b..7201188 100644
--- a/xf86dga.h
+++ b/xf86dga.h
@@ -1,7 +1,7 @@
 /*
    Copyright (c) 1999  XFree86 Inc
 */
-/* $XFree86: xc/include/extensions/xf86dga.h,v 3.21 2001/08/01 00:44:36 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86dga.h,v 3.20 1999/10/13 04:20:48 dawes Exp $ */
 
 #ifndef _XF86DGA_H_
 #define _XF86DGA_H_
diff --git a/xf86dga1.h b/xf86dga1.h
index bbc6b12..4f45e74 100644
--- a/xf86dga1.h
+++ b/xf86dga1.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.3 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.2 1999/04/17 07:05:41 dawes Exp $ */
 /*
 
 Copyright (c) 1995  Jon Tombs
diff --git a/xf86dga1str.h b/xf86dga1str.h
index 5695fbd..0dfde9b 100644
--- a/xf86dga1str.h
+++ b/xf86dga1str.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.2 1999/05/03 12:15:37 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */
 /*
 
 Copyright (c) 1995  Jon Tombs
diff --git a/xf86dgastr.h b/xf86dgastr.h
index e66b030..66dd354 100644
--- a/xf86dgastr.h
+++ b/xf86dgastr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.14 2001/08/01 00:44:36 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.13 2000/12/20 00:19:41 mvojkovi Exp $ */
 /*
 
 Copyright (c) 1995  Jon Tombs