18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW

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

14 files changed, 14 insertions, 14 deletions

diff --git a/Dvi.c b/Dvi.c
index 4148020..45e6322 100644
--- a/Dvi.c
+++ b/Dvi.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xditview/Dvi.c,v 1.4 2001/08/27 23:35:12 dawes Exp $ */
+/* $XFree86: xc/programs/xditview/Dvi.c,v 1.3 2001/08/01 00:45:03 tsi Exp $ */
 
 
 /*
diff --git a/Dvi.h b/Dvi.h
index fda78fb..95311fa 100644
--- a/Dvi.h
+++ b/Dvi.h
@@ -1,7 +1,7 @@
 /*
 * $XConsortium: Dvi.h,v 1.5 91/07/25 21:33:53 keith Exp $
 */
-/* $XFree86: xc/programs/xditview/Dvi.h,v 1.3 2000/12/04 21:01:01 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XtDvi_h
 #define _XtDvi_h
diff --git a/DviChar.c b/DviChar.c
index ebef6a8..3718c74 100644
--- a/DviChar.c
+++ b/DviChar.c
@@ -6,7 +6,7 @@
  * Map DVI (ditrof output) character names to
  * font indexes and back
  */
-/* $XFree86: xc/programs/xditview/DviChar.c,v 1.3 2001/08/28 16:48:09 tsi Exp $ */
+/* $XFree86$ */
 
 # include   <X11/Intrinsic.h>
 # include   "DviChar.h"
diff --git a/DviChar.h b/DviChar.h
index b5187b4..1097f6a 100644
--- a/DviChar.h
+++ b/DviChar.h
@@ -9,7 +9,7 @@
  * case insensitive, a dash seperating the
  * CharSetRegistry from the CharSetEncoding
  */
-/* $XFree86: xc/programs/xditview/DviChar.h,v 1.2 2001/08/01 00:45:03 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _DVICHAR_H_
 #define _DVICHAR_H_
diff --git a/DviP.h b/DviP.h
index f06e16d..2ead024 100644
--- a/DviP.h
+++ b/DviP.h
@@ -1,7 +1,7 @@
 /*
  * $XConsortium: DviP.h,v 1.10 92/02/11 01:27:15 keith Exp $
  */
-/* $XFree86: xc/programs/xditview/DviP.h,v 1.5 2002/06/20 17:40:44 keithp Exp $ */
+/* $XFree86: xc/programs/xditview/DviP.h,v 1.4 2001/08/01 00:45:03 tsi Exp $ */
 
 /* 
  * DviP.h - Private definitions for Dvi widget
diff --git a/XFontName.c b/XFontName.c
index 2bbe118..b8d1a09 100644
--- a/XFontName.c
+++ b/XFontName.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xditview/XFontName.c,v 1.3 2001/08/27 23:35:12 dawes Exp $ */
+/* $XFree86: xc/programs/xditview/XFontName.c,v 1.2 2001/08/01 00:45:03 tsi Exp $ */
 /*
  * XFontName.c
  *
diff --git a/XFontName.h b/XFontName.h
index f28c046..b75ed9e 100644
--- a/XFontName.h
+++ b/XFontName.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xditview/XFontName.h,v 1.2 2001/08/01 00:45:03 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _XFONTNAME_H_
 #define _XFONTNAME_H_
diff --git a/draw.c b/draw.c
index e884dfd..78b707f 100644
--- a/draw.c
+++ b/draw.c
@@ -1,6 +1,6 @@
 /*
  * $XConsortium: draw.c,v 1.8 94/04/17 20:43:35 gildea Exp $
- * $XFree86: xc/programs/xditview/draw.c,v 1.5 2001/08/27 23:35:12 dawes Exp $
+ * $XFree86: xc/programs/xditview/draw.c,v 1.4 2001/08/01 00:45:03 tsi Exp $
  *
 Copyright (c) 1991  X Consortium
 
diff --git a/font.c b/font.c
index 8eed02b..210a374 100644
--- a/font.c
+++ b/font.c
@@ -3,7 +3,7 @@
  *
  * map dvi fonts to X fonts
  */
-/* $XFree86: xc/programs/xditview/font.c,v 1.6 2002/06/19 20:09:19 keithp Exp $ */
+/* $XFree86: xc/programs/xditview/font.c,v 1.5 2001/08/27 23:35:12 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/IntrinsicP.h>
diff --git a/lex.c b/lex.c
index 0d58818..12158ed 100644
--- a/lex.c
+++ b/lex.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xditview/lex.c,v 1.4 2001/08/01 00:45:03 tsi Exp $ */
+/* $XFree86: xc/programs/xditview/lex.c,v 1.3 2000/12/04 21:01:01 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/IntrinsicP.h>
diff --git a/page.c b/page.c
index 0d5fb79..a1c65f1 100644
--- a/page.c
+++ b/page.c
@@ -1,5 +1,5 @@
 /* $XConsortium: page.c,v 1.5 91/07/26 00:40:20 keith Exp $ */
-/* $XFree86: xc/programs/xditview/page.c,v 1.4 2001/08/27 23:35:12 dawes Exp $ */
+/* $XFree86: xc/programs/xditview/page.c,v 1.3 2001/08/01 00:45:03 tsi Exp $ */
 
 /*
  * page.c
diff --git a/parse.c b/parse.c
index 153ccd8..0f5bc68 100644
--- a/parse.c
+++ b/parse.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xditview/parse.c,v 1.6 2003/05/27 22:27:00 tsi Exp $ */
+/* $XFree86: xc/programs/xditview/parse.c,v 1.5tsi Exp $ */
 
 /*
  * parse.c
diff --git a/xditview.c b/xditview.c
index a436b7a..41f3bf4 100644
--- a/xditview.c
+++ b/xditview.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xditview/xditview.c,v 1.5 2003/05/27 22:27:00 tsi Exp $ */
+/* $XFree86: xc/programs/xditview/xditview.c,v 1.4tsi Exp $ */
 /*
  * xditview -- 
  *
diff --git a/xditview.man b/xditview.man
index 96172ab..c75c8a8 100644
--- a/xditview.man
+++ b/xditview.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xditview.man,v 1.10 94/04/17 20:43:37 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xditview/xditview.man,v 1.5 2003/05/29 21:48:11 herrb Exp $
+.\" $XFree86: xc/programs/xditview/xditview.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
 .\"
 .TH XDITVIEW 1 __xorgversion__
 .SH NAME