Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_99_99_900XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

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