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

2 files changed, 2 insertions, 2 deletions

diff --git a/mkcfm.c b/mkcfm.c
index eda500e..67d5399 100644
--- a/mkcfm.c
+++ b/mkcfm.c
@@ -16,7 +16,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.13 2003/05/27 22:26:56 tsi Exp $ */
+/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.12tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/mkcfm.man b/mkcfm.man
index 9826eb7..fbb584b 100644
--- a/mkcfm.man
+++ b/mkcfm.man
@@ -15,7 +15,7 @@
 .\" The Original Software is CID font code that was developed by Silicon
 .\" Graphics, Inc.
 .\"
-.\" $XFree86: xc/programs/mkcfm/mkcfm.man,v 1.2 1999/05/15 12:10:37 dawes Exp $
+.\" $XFree86: xc/programs/mkcfm/mkcfm.man,v 1.1 1999/05/03 05:58:59 dawes Exp $
 .TH MKCFM 1 "Release 1.0" "CID Fonts Version 1.0"
 .SH NAME
 mkcfm - create summaries of font metric files in CID font directories