diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
commit | 4ed556c1a9d6372e03dc2aabd6f60e4f3da34d42 (patch) | |
tree | 2bdad9bd73f2df74cc07dbd86dd47113adc892db | |
parent | fe1ca2347d52d022a503a81d3a7117a93bb707c6 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | mkcfm.c | 2 | ||||
-rw-r--r-- | mkcfm.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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> @@ -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 |