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

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

41 files changed, 41 insertions, 41 deletions

diff --git a/src/Type1/afm.c b/src/Type1/afm.c
index 960e76f..7df8eba 100644
--- a/src/Type1/afm.c
+++ b/src/Type1/afm.c
@@ -15,7 +15,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/afm.c,v 1.3 2001/08/27 19:49:52 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/afm.c,v 1.2 1999/08/21 13:47:38 dawes Exp $ */
 
 #ifdef BUILDCID
 #ifndef FONTMODULE
diff --git a/src/Type1/arith.c b/src/Type1/arith.c
index 6caaa3f..c9de69f 100644
--- a/src/Type1/arith.c
+++ b/src/Type1/arith.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/arith.c,v 1.7 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/arith.c,v 1.6tsi Exp $ */
 
  /* ARITH    CWEB         V0006 ********                             */
 /*
diff --git a/src/Type1/arith.h b/src/Type1/arith.h
index 0eae659..6c810b9 100644
--- a/src/Type1/arith.h
+++ b/src/Type1/arith.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/arith.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/arith.h,v 1.4 1999/08/21 13:47:39 dawes Exp $ */
 
 /*SHARED*/
 
diff --git a/src/Type1/blues.h b/src/Type1/blues.h
index c3943ec..88602f7 100644
--- a/src/Type1/blues.h
+++ b/src/Type1/blues.h
@@ -28,7 +28,7 @@
  * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/blues.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/blues.h,v 1.3 1999/08/22 08:58:49 dawes Exp $ */
 
  
 extern psobj *GetType1CharString ( psfont *fontP, unsigned char code );
diff --git a/src/Type1/cidchar.c b/src/Type1/cidchar.c
index 593337e..6699318 100644
--- a/src/Type1/cidchar.c
+++ b/src/Type1/cidchar.c
@@ -15,7 +15,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.10 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.9tsi Exp $ */
 
 #ifdef BUILDCID
 #ifndef FONTMODULE
diff --git a/src/Type1/curves.c b/src/Type1/curves.c
index 206958a..36336e4 100644
--- a/src/Type1/curves.c
+++ b/src/Type1/curves.c
@@ -29,7 +29,7 @@
 /* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT        */
 /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS           */
 /* SOFTWARE.                                                         */
-/* $XFree86: xc/lib/font/Type1/curves.c,v 1.8 2002/02/18 20:51:57 herrb Exp $ */
+/* $XFree86: xc/lib/font/Type1/curves.c,v 1.7 2001/08/27 19:49:52 dawes Exp $ */
 
 /*
 :h1.CURVES Module - Stepping Beziers
diff --git a/src/Type1/curves.h b/src/Type1/curves.h
index ff2bf48..ca54bad 100644
--- a/src/Type1/curves.h
+++ b/src/Type1/curves.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/curves.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/curves.h,v 1.3 1999/08/22 08:58:50 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/fontfcn.c b/src/Type1/fontfcn.c
index 471a4ee..45078d7 100644
--- a/src/Type1/fontfcn.c
+++ b/src/Type1/fontfcn.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.11 2001/11/23 19:21:31 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.10 2001/04/05 17:42:27 dawes Exp $ */
  
 #ifndef FONTMODULE
 #include <stdio.h>
diff --git a/src/Type1/fontfcn.h b/src/Type1/fontfcn.h
index 9383e42..b53b4df 100644
--- a/src/Type1/fontfcn.h
+++ b/src/Type1/fontfcn.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.4 1999/08/22 08:58:50 dawes Exp $ */
 
 
 #ifdef BUILDCID
diff --git a/src/Type1/hints.c b/src/Type1/hints.c
index 81b8a2c..691da9b 100644
--- a/src/Type1/hints.c
+++ b/src/Type1/hints.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/hints.c,v 1.8 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/hints.c,v 1.7tsi Exp $ */
 
  /* HINTS    CWEB         V0006 ********                             */
 /*
diff --git a/src/Type1/hints.h b/src/Type1/hints.h
index d5bb829..8e2ae2a 100644
--- a/src/Type1/hints.h
+++ b/src/Type1/hints.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/hints.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/hints.h,v 1.3 1999/08/22 08:58:51 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/lines.c b/src/Type1/lines.c
index 197943f..c2b0028 100644
--- a/src/Type1/lines.c
+++ b/src/Type1/lines.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/lines.c,v 1.5 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/lines.c,v 1.4tsi Exp $ */
 
  /* LINES    CWEB         V0003 ********                             */
 /*
diff --git a/src/Type1/lines.h b/src/Type1/lines.h
index c0d7392..f8ffd3a 100644
--- a/src/Type1/lines.h
+++ b/src/Type1/lines.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/lines.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/lines.h,v 1.3 1999/08/22 08:58:52 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/objects.c b/src/Type1/objects.c
index 2f2d30a..e79b338 100644
--- a/src/Type1/objects.c
+++ b/src/Type1/objects.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/objects.c,v 1.11 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/objects.c,v 1.10tsi Exp $ */
  /* OBJECTS  CWEB         V0025 ********                             */
 /*
 :h1.OBJECTS Module - TYPE1IMAGER Objects Common Routines
diff --git a/src/Type1/objects.h b/src/Type1/objects.h
index e64d00e..59a22d6 100644
--- a/src/Type1/objects.h
+++ b/src/Type1/objects.h
@@ -43,7 +43,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/objects.h,v 1.15 2003/05/27 22:26:45 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/objects.h,v 1.14tsi Exp $ */
 /*SHARED*/
  
 /*END SHARED*/
diff --git a/src/Type1/paths.c b/src/Type1/paths.c
index 3fec84e..4fa5f06 100644
--- a/src/Type1/paths.c
+++ b/src/Type1/paths.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/paths.c,v 1.8 2003/05/27 22:26:46 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/paths.c,v 1.7tsi Exp $ */
 
  /* PATHS    CWEB         V0021 ********                             */
 /*
diff --git a/src/Type1/paths.h b/src/Type1/paths.h
index 3f1b389..b61275b 100644
--- a/src/Type1/paths.h
+++ b/src/Type1/paths.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/paths.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/paths.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/pictures.h b/src/Type1/pictures.h
index aa02ce5..0abc715 100644
--- a/src/Type1/pictures.h
+++ b/src/Type1/pictures.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */
 
 /* STUB */
  
diff --git a/src/Type1/regions.c b/src/Type1/regions.c
index e24bacc..f747c8a 100644
--- a/src/Type1/regions.c
+++ b/src/Type1/regions.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.c,v 3.9 2003/05/27 22:26:46 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.c,v 3.8tsi Exp $ */
  /* REGIONS  CWEB         V0023 LOTS                                 */
 /*
 :h1 id=regions.REGIONS Module - Regions Operator Handler
diff --git a/src/Type1/regions.h b/src/Type1/regions.h
index 9d27e76..96ad1a5 100644
--- a/src/Type1/regions.h
+++ b/src/Type1/regions.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.h,v 1.8 2001/06/15 08:09:20 alanh Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.h,v 1.7 2001/01/17 19:43:23 dawes Exp $ */
 /*SHARED*/
  
 #define   Interior(p,rule)        t1_Interior(p,rule)
diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c
index de3836a..64f7473 100644
--- a/src/Type1/scanfont.c
+++ b/src/Type1/scanfont.c
@@ -46,7 +46,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.17 2003/11/29 04:55:28 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.16 2003/05/27 22:26:46 tsi Exp $ */
 
 #ifndef FONTMODULE
 #include <string.h>
diff --git a/src/Type1/spaces.c b/src/Type1/spaces.c
index 9c79954..1b2e7ae 100644
--- a/src/Type1/spaces.c
+++ b/src/Type1/spaces.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.11 2003/05/27 22:26:47 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.10tsi Exp $ */
  /* SPACES   CWEB         V0021 ********                             */
 /*
 :h1 id=spaces.SPACES Module - Handles Coordinate Spaces
diff --git a/src/Type1/spaces.h b/src/Type1/spaces.h
index efbcecb..ef78f2f 100644
--- a/src/Type1/spaces.h
+++ b/src/Type1/spaces.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.4 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.3 1999/08/22 08:58:53 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index 087c7e5..ecbd4d2 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -71,7 +71,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.33 2003/07/19 13:16:40 tsi Exp $ */
 
 /*
 
diff --git a/src/Type1/t1imager.h b/src/Type1/t1imager.h
index 7d72495..9730f9a 100644
--- a/src/Type1/t1imager.h
+++ b/src/Type1/t1imager.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.5 2001/07/25 15:04:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */
 
 
 #include "objects.h"
diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c
index c1ef5f6..f6a5012 100644
--- a/src/Type1/t1info.c
+++ b/src/Type1/t1info.c
@@ -99,7 +99,7 @@ from The Open Group.
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.19 2003/05/27 22:26:47 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.18tsi Exp $ */
 
 #include "fntfilst.h"
 #include "fontutil.h"
diff --git a/src/Type1/t1intf.h b/src/Type1/t1intf.h
index c1e0e44..3a1f00b 100644
--- a/src/Type1/t1intf.h
+++ b/src/Type1/t1intf.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.7 2001/07/25 15:04:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.6 2001/01/17 19:43:23 dawes Exp $ */
 
 #ifdef BUILDCID
 #include "AFM.h"
diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c
index d5ce774..0843ae1 100644
--- a/src/Type1/t1io.c
+++ b/src/Type1/t1io.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.8 2001/01/17 19:43:23 dawes Exp $ */
 /*******************************************************************
 *  I/O package for Type 1 font reading
 ********************************************************************/
diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c
index 81ff220..9c885a0 100644
--- a/src/Type1/t1malloc.c
+++ b/src/Type1/t1malloc.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.11 2002/02/18 20:51:57 herrb Exp $ */
  /* MALLOC   CWEB         V0004 LOTS                                 */
 /*
 :h1.MALLOC - Fast Memory Allocation
diff --git a/src/Type1/t1snap.c b/src/Type1/t1snap.c
index 90c396b..96b99f2 100644
--- a/src/Type1/t1snap.c
+++ b/src/Type1/t1snap.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
 
  
 #include "objects.h"
diff --git a/src/Type1/t1stdio.h b/src/Type1/t1stdio.h
index d4e71e8..cc4ba9d 100644
--- a/src/Type1/t1stdio.h
+++ b/src/Type1/t1stdio.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.10 2001/07/25 15:04:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.9 2001/01/17 19:43:24 dawes Exp $ */
 /* T1IO FILE structure and related stuff */
 #ifdef XFree86LOADER
 #undef FILE
diff --git a/src/Type1/t1stub.c b/src/Type1/t1stub.c
index cfe6ea9..2c6cfed 100644
--- a/src/Type1/t1stub.c
+++ b/src/Type1/t1stub.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.9 2002/02/18 20:51:57 herrb Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.8 2001/01/17 19:43:24 dawes Exp $ */
 
 #ifdef FONTMODULE
 #include "Xdefs.h"	/* Bool declaration */
diff --git a/src/Type1/t1unicode.c b/src/Type1/t1unicode.c
index c6b1cd9..96f646d 100644
--- a/src/Type1/t1unicode.c
+++ b/src/Type1/t1unicode.c
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/Type1/t1unicode.c,v 1.1 1999/01/31 04:59:30 dawes Exp $ */
+/* $XFree86$ */
 
 #include "t1unicode.h"
 
diff --git a/src/Type1/t1unicode.h b/src/Type1/t1unicode.h
index f2a13fd..bad0274 100644
--- a/src/Type1/t1unicode.h
+++ b/src/Type1/t1unicode.h
@@ -20,6 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/Type1/t1unicode.h,v 1.1 1999/01/31 04:59:31 dawes Exp $ */
+/* $XFree86$ */
 
 char *unicodetoPSname(unsigned short code);
diff --git a/src/Type1/token.c b/src/Type1/token.c
index 6fb4109..0ec1947 100644
--- a/src/Type1/token.c
+++ b/src/Type1/token.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/token.c,v 1.6 2003/05/27 22:26:47 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/token.c,v 1.5tsi Exp $ */
 /* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */
 #include "t1stdio.h"
 #include "util.h"
diff --git a/src/Type1/token.h b/src/Type1/token.h
index caa2ca2..6639828 100644
--- a/src/Type1/token.h
+++ b/src/Type1/token.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/token.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/token.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
 
 #ifndef TOKEN_H
 #define TOKEN_H
diff --git a/src/Type1/tokst.h b/src/Type1/tokst.h
index 61f1ff9..02166af 100644
--- a/src/Type1/tokst.h
+++ b/src/Type1/tokst.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
 
 /* -------------------------------------- */
 /* --- MACHINE GENERATED, DO NOT EDIT --- */
diff --git a/src/Type1/trig.h b/src/Type1/trig.h
index f442a61..d569ed0 100644
--- a/src/Type1/trig.h
+++ b/src/Type1/trig.h
@@ -29,7 +29,7 @@
  */
 /*SHARED*/
 
-/* $XFree86: xc/lib/font/Type1/trig.h,v 1.3 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/trig.h,v 1.2 1998/07/25 06:57:00 dawes Exp $ */
 
 #undef    DegreeCos
 #undef    DegreeSin
diff --git a/src/Type1/type1.c b/src/Type1/type1.c
index 9bb8d00..e68ee5c 100644
--- a/src/Type1/type1.c
+++ b/src/Type1/type1.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/type1.c,v 1.10 2003/05/27 22:26:47 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/type1.c,v 1.9tsi Exp $ */
  
 /*********************************************************************/
 /*                                                                   */
diff --git a/src/Type1/util.c b/src/Type1/util.c
index 9bd8a83..74d53fc 100644
--- a/src/Type1/util.c
+++ b/src/Type1/util.c
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/util.c,v 1.6 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/util.c,v 1.5 1999/08/21 13:47:53 dawes Exp $ */
 /* Author: Katherine A. Hitchcock    IBM Almaden Research Laboratory */
  
 #ifndef FONTMODULE
diff --git a/src/Type1/util.h b/src/Type1/util.h
index 7abc289..ad4ad14 100644
--- a/src/Type1/util.h
+++ b/src/Type1/util.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/util.h,v 1.5 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/util.h,v 1.4 1999/08/22 08:58:55 dawes Exp $ */
 
 #ifndef UTIL_H
 #define UTIL_H