18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

15 files changed, 15 insertions, 15 deletions

diff --git a/ScrollByL.c b/ScrollByL.c
index 42d942d..9f8c359 100644
--- a/ScrollByL.c
+++ b/ScrollByL.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/ScrollByL.c,v 1.7 2003/05/27 22:27:07 tsi Exp $ */
+/* $XFree86: xc/programs/xman/ScrollByL.c,v 1.6tsi Exp $ */
 
 #if !defined(lint) && !defined(SABER) && 0
   static char rcs_version[] = "$Athena: ScrollByL.c,v 4.5 88/12/19 13:46:04 kit Exp $";
diff --git a/buttons.c b/buttons.c
index 5779280..d30d52f 100644
--- a/buttons.c
+++ b/buttons.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/buttons.c,v 1.4 2003/01/19 04:44:45 paulo Exp $ */
+/* $XFree86: xc/programs/xman/buttons.c,v 1.3 2000/03/03 23:16:26 dawes Exp $ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/defs.h b/defs.h
index 1f40e50..3077f79 100644
--- a/defs.h
+++ b/defs.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/defs.h,v 1.3 2001/04/19 19:54:51 dawes Exp $ */
+/* $XFree86: xc/programs/xman/defs.h,v 1.2 2000/03/03 23:16:26 dawes Exp $ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/globals.h b/globals.h
index f6ab862..d629f51 100644
--- a/globals.h
+++ b/globals.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/globals.h,v 1.3 2000/03/03 23:16:26 dawes Exp $ */
+/* $XFree86$ */
 
 #include "man.h"
 
diff --git a/handler.c b/handler.c
index 0f16c38..8a8f4f9 100644
--- a/handler.c
+++ b/handler.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/handler.c,v 1.7 2003/04/09 20:31:31 herrb Exp $ */
+/* $XFree86: xc/programs/xman/handler.c,v 1.6 2003/01/19 04:44:45 paulo Exp $ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/help.c b/help.c
index 5abea46..76956df 100644
--- a/help.c
+++ b/help.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/help.c,v 1.3 2000/03/03 23:16:27 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/main.c b/main.c
index fb30b5a..29ceb72 100644
--- a/main.c
+++ b/main.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/main.c,v 1.4 2001/10/28 03:34:36 tsi Exp $ */
+/* $XFree86: xc/programs/xman/main.c,v 1.3 2000/03/03 23:16:27 dawes Exp $ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/man.c b/man.c
index 452425f..7254373 100644
--- a/man.c
+++ b/man.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/man.c,v 1.8 2003/04/09 20:31:31 herrb Exp $ */
+/* $XFree86: xc/programs/xman/man.c,v 1.7 2002/08/05 01:47:34 torrey Exp $ */
 
 
 #include "globals.h"
diff --git a/man.h b/man.h
index b189473..2f4f123 100644
--- a/man.h
+++ b/man.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/man.h,v 1.4 2001/07/25 15:05:27 dawes Exp $ */
+/* $XFree86: xc/programs/xman/man.h,v 1.3 2000/03/03 23:16:27 dawes Exp $ */
 
 
 /* X toolkit header files */
diff --git a/misc.c b/misc.c
index fc7f488..e8c5be8 100644
--- a/misc.c
+++ b/misc.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/misc.c,v 1.10 2003/08/02 17:35:48 herrb Exp $ */
+/* $XFree86: xc/programs/xman/misc.c,v 1.9 2003/05/27 22:27:08 tsi Exp $ */
 
 /*
  * xman - X window system manual page display program.
diff --git a/search.c b/search.c
index eece3b6..48d048a 100644
--- a/search.c
+++ b/search.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/search.c,v 1.6 2003/04/09 20:31:31 herrb Exp $ */
+/* $XFree86: xc/programs/xman/search.c,v 1.5 2001/01/27 17:24:27 herrb Exp $ */
 
 
 #include "globals.h"
diff --git a/tkfuncs.c b/tkfuncs.c
index 2471352..0222e7c 100644
--- a/tkfuncs.c
+++ b/tkfuncs.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/tkfuncs.c,v 1.3 2000/03/03 23:16:28 dawes Exp $ */
+/* $XFree86$ */
 
 #include <X11/X.h>
 #include <X11/Xos.h>
diff --git a/vendor.c b/vendor.c
index e91b7a9..7754116 100644
--- a/vendor.c
+++ b/vendor.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/vendor.c,v 1.3 2000/03/03 23:16:28 dawes Exp $ */
+/* $XFree86: xc/programs/xman/vendor.c,v 1.2 2000/03/03 20:02:25 dawes Exp $ */
 
 /* Vendor-specific data structures and operations */
 
diff --git a/vendor.h b/vendor.h
index 1b57574..43b1520 100644
--- a/vendor.h
+++ b/vendor.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/vendor.h,v 1.13 2003/07/29 21:16:56 dawes Exp $ */
+/* $XFree86: xc/programs/xman/vendor.h,v 1.12 2003/03/26 20:43:59 tsi Exp $ */
 
 /* Vendor-specific definitions */
 
diff --git a/xman.man b/xman.man
index 2eab384..76c1cb0 100644
--- a/xman.man
+++ b/xman.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xman.man,v 1.23 94/04/17 20:44:02 matt Exp $
 .\"
-.\" $XFree86: xc/programs/xman/xman.man,v 1.4 2002/10/12 16:06:48 herrb Exp $
+.\" $XFree86: xc/programs/xman/xman.man,v 1.3 2001/01/27 18:21:18 dawes Exp $
 .\"
 .TH XMAN 1 __xorgversion__
 .SH NAME