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 | 7436ecbe6acff93bf58c8469b29200fbcb6605fd (patch) | |
tree | 6a80c1789fa37841d2d18031a3ae0a9665300c07 | |
parent | 4a5e215d4292b2a4f8340220a68efa07c6f0b46a (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).
-rwxr-xr-x | mkfontdir.cpp | 4 | ||||
-rw-r--r-- | mkfontdir.man | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mkfontdir.cpp b/mkfontdir.cpp new file mode 100755 index 0000000..e734bb1 --- /dev/null +++ b/mkfontdir.cpp @@ -0,0 +1,4 @@ +XCOMM!/bin/sh +XCOMM $XFree86: xc/programs/mkfontdir/mkfontdir,v 1.2 2003/07/18 14:51:43 tsi Exp $ + +exec BINDIR/mkfontscale -b -s -l "$@" diff --git a/mkfontdir.man b/mkfontdir.man index 21324a8..e2eb251 100644 --- a/mkfontdir.man +++ b/mkfontdir.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.15 2001/12/14 20:00:59 dawes Exp $ +.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.14 2001/11/01 23:35:34 dawes Exp $ .\" .TH MKFONTDIR 1 __xorgversion__ .SH NAME |