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

5 files changed, 5 insertions, 5 deletions

diff --git a/config.c b/config.c
index 08787f6..89932ce 100644
--- a/config.c
+++ b/config.c
@@ -25,7 +25,7 @@ not be 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/programs/proxymngr/config.c,v 1.7 2001/12/14 20:01:01 dawes Exp $ */
+/* $XFree86: xc/programs/proxymngr/config.c,v 1.6 2001/01/17 23:45:02 dawes Exp $ */
 
 #include <stdlib.h>
 
diff --git a/main.c b/main.c
index cfd1955..913939b 100644
--- a/main.c
+++ b/main.c
@@ -25,7 +25,7 @@ not be 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/programs/proxymngr/main.c,v 1.9 2003/07/09 15:27:36 tsi Exp $ */
+/* $XFree86: xc/programs/proxymngr/main.c,v 1.8tsi Exp $ */
 
 #include <stdlib.h>
 #include "pmint.h"
diff --git a/pmdb.c b/pmdb.c
index a191c66..4b5305a 100644
--- a/pmdb.c
+++ b/pmdb.c
@@ -25,7 +25,7 @@ not be 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/programs/proxymngr/pmdb.c,v 1.8 2003/09/13 21:33:11 dawes Exp $ */
+/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.7 2001/12/14 20:01:02 dawes Exp $ */
 
 #include "pmint.h"
 #include "pmdb.h"
diff --git a/pmint.h b/pmint.h
index 49c562f..f1413df 100644
--- a/pmint.h
+++ b/pmint.h
@@ -25,7 +25,7 @@ not be 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/programs/proxymngr/pmint.h,v 1.6 2003/09/13 21:33:11 dawes Exp $ */
+/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.5 2001/12/14 20:01:02 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Xos.h>
diff --git a/proxymngr.man b/proxymngr.man
index 5c09994..21a8092 100644
--- a/proxymngr.man
+++ b/proxymngr.man
@@ -24,7 +24,7 @@
 .\" from The Open Group.
 .\" 
 .\"
-.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.9 2003/05/29 21:48:10 herrb Exp $
+.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.8 2003/02/20 03:27:32 dawes Exp $
 .\"
 .TH PROXYMNGR 1 __xorgversion__
 .SH NAME