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

12 files changed, 12 insertions, 12 deletions

diff --git a/src/delta/lbxdelta.c b/src/delta/lbxdelta.c
index 29e6999..7066a9c 100644
--- a/src/delta/lbxdelta.c
+++ b/src/delta/lbxdelta.c
@@ -22,7 +22,7 @@
  *
  * Author:  Dale Tonogai, Network Computing Devices
  */
-/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.8 2001/08/27 19:01:07 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/src/image/dfaxg42d.c b/src/image/dfaxg42d.c
index adeaa25..ec4c8a3 100644
--- a/src/image/dfaxg42d.c
+++ b/src/image/dfaxg42d.c
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.6 2001/04/23 20:31:05 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.5 2001/01/17 19:43:35 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
diff --git a/src/image/dpackbits.c b/src/image/dpackbits.c
index e070dd0..bb5f12a 100644
--- a/src/image/dpackbits.c
+++ b/src/image/dpackbits.c
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.4 2001/01/17 19:43:35 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.3 2000/05/18 23:46:16 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
diff --git a/src/image/efaxg42d.c b/src/image/efaxg42d.c
index 3dd115a..83dcf4f 100644
--- a/src/image/efaxg42d.c
+++ b/src/image/efaxg42d.c
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.5 2001/04/23 20:31:05 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.4 2001/01/17 19:43:35 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
diff --git a/src/image/lbxbwcodes.h b/src/image/lbxbwcodes.h
index c4b7c50..e26e286 100644
--- a/src/image/lbxbwcodes.h
+++ b/src/image/lbxbwcodes.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/lbxbwcodes.h,v 1.3 2001/03/05 01:05:12 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * Note that these tables are ordered such that the
diff --git a/src/image/lbxfax.h b/src/image/lbxfax.h
index b2a72cb..beac228 100644
--- a/src/image/lbxfax.h
+++ b/src/image/lbxfax.h
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/lbxfax.h,v 1.5 2001/03/05 01:05:12 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * This header file contains various constants and tables needed
diff --git a/src/image/mkg3states.c b/src/image/mkg3states.c
index c9c4b7f..0e8fe36 100644
--- a/src/image/mkg3states.c
+++ b/src/image/mkg3states.c
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.4 2001/01/17 19:43:35 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.3 1999/02/01 11:55:49 dawes Exp $ */
 
 /*
  * Program to construct Group 3 & Group 4 decoding tables.
diff --git a/src/lbx_zlib/lbx_zlib.c b/src/lbx_zlib/lbx_zlib.c
index 95ae326..3ffb7e9 100644
--- a/src/lbx_zlib/lbx_zlib.c
+++ b/src/lbx_zlib/lbx_zlib.c
@@ -50,7 +50,7 @@ from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.10 2001/12/14 19:56:59 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.9 2001/08/27 19:01:07 dawes Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h
index 029fd29..22e901a 100644
--- a/src/lbx_zlib/lbx_zlib.h
+++ b/src/lbx_zlib/lbx_zlib.h
@@ -50,7 +50,7 @@ from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.10 2001/12/14 19:57:00 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.9 2001/08/27 19:01:07 dawes Exp $ */
 
 #include "zlib.h"
 #include "Xfuncproto.h"
diff --git a/src/lbx_zlib/lbx_zlib_io.c b/src/lbx_zlib/lbx_zlib_io.c
index b6677ce..89b095d 100644
--- a/src/lbx_zlib/lbx_zlib_io.c
+++ b/src/lbx_zlib/lbx_zlib_io.c
@@ -22,7 +22,7 @@
  *
  * Author:  Dale Tonogai, Network Computing Devices
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.12 2001/07/25 15:04:57 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.11 2001/01/17 19:43:36 dawes Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
diff --git a/src/lbx_zlib/reqstats.c b/src/lbx_zlib/reqstats.c
index b0d0180..50545b8 100644
--- a/src/lbx_zlib/reqstats.c
+++ b/src/lbx_zlib/reqstats.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.6 2001/12/14 19:57:01 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.5 2001/08/27 19:01:07 dawes Exp $ */
 
 #include "reqstats.h"
 
diff --git a/src/lbx_zlib/reqstats.h b/src/lbx_zlib/reqstats.h
index d22e4e7..eab64e9 100644
--- a/src/lbx_zlib/reqstats.h
+++ b/src/lbx_zlib/reqstats.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.h,v 1.3 2001/12/14 19:57:01 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.h,v 1.2 2001/08/27 19:01:07 dawes Exp $ */
 
 #ifdef LBXREQSTATS
 struct ReqStats {