Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE

10 files changed, 13 insertions, 11 deletions

diff --git a/AuDispose.c b/AuDispose.c
index 4847abc..c3d9a35 100644
--- a/AuDispose.c
+++ b/AuDispose.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.4 2001/07/25 15:04:48 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <stdlib.h>
diff --git a/AuFileName.c b/AuFileName.c
index a1bb520..d1057fa 100644
--- a/AuFileName.c
+++ b/AuFileName.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.7 2001/12/14 19:54:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
diff --git a/AuGetAddr.c b/AuGetAddr.c
index b0a4caf..f55973b 100644
--- a/AuGetAddr.c
+++ b/AuGetAddr.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.6 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
diff --git a/AuGetBest.c b/AuGetBest.c
index c8661eb..f68d8e0 100644
--- a/AuGetBest.c
+++ b/AuGetBest.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.8 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.7 2001/12/14 19:54:36 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
diff --git a/AuLock.c b/AuLock.c
index 89c4814..5374948 100644
--- a/AuLock.c
+++ b/AuLock.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuLock.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuLock.c,v 3.6 2002/05/31 18:45:43 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
diff --git a/AuRead.c b/AuRead.c
index d547205..984d00f 100644
--- a/AuRead.c
+++ b/AuRead.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuRead.c,v 1.6 2001/12/14 19:54:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuRead.c,v 1.5 2001/07/25 15:04:48 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <stdlib.h>
diff --git a/AuUnlock.c b/AuUnlock.c
index 8783b56..bc695ad 100644
--- a/AuUnlock.c
+++ b/AuUnlock.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.5 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
diff --git a/AuWrite.c b/AuWrite.c
index e1f352e..b4cd57c 100644
--- a/AuWrite.c
+++ b/AuWrite.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */
 
 #include <X11/Xauth.h>
 
diff --git a/Xau.man b/Xau.man
index db90093..a336523 100644
--- a/Xau.man
+++ b/Xau.man
@@ -1,4 +1,6 @@
 .\" $Xorg: Xau.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $
+.\" $XdotOrg$
+.\"
 .\" Copyright (c) 1994  X Consortium
 .\" 
 .\" Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +26,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" X Consortium.
 .\"
-.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $
 .\"
 .TH Xau 3 __xorgversion__
 .SH NAME
@@ -82,7 +84,7 @@ not be freed.
 \fBnot\fP statically allocated and should be freed by calling
 \fIXauDisposeAuth\fP.
 .PP
-\fBXuWriteAuth\fP writes an authorization entry to \fIauth_file\fP.  It
+\fBXauWriteAuth\fP writes an authorization entry to \fIauth_file\fP.  It
 returns 1 on success, 0 on failure.
 .PP
 \fBXauGetAuthByAddr\fP searches for an entry which matches the given network
diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h
index 7340687..fa9c96b 100644
--- a/include/X11/Xauth.h
+++ b/include/X11/Xauth.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xau/Xauth.h,v 1.6 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
 
 #ifndef _Xauth_h
 #define _Xauth_h