diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:44:03 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:44:03 +0000 |
| commit | 4cab187871552490b6679c384ada8a57d67f64de (patch) | |
| tree | fdb8d683ee353a761657a7f42ce2c3aab93105c8 | |
| parent | e20ec108e9544bc477eea2dcb76254c61772a39c (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | data.h | 1 | ||||
| -rw-r--r-- | mkfontscale.c | 2 | ||||
| -rw-r--r-- | mkfontscale.man | 6 |
3 files changed, 6 insertions, 3 deletions
@@ -39,6 +39,7 @@ char *notice_foundries[][2] = {"International Typeface Corporation", "itc"}, {"Tiro Typeworks", "tiro"}, {"XFree86", "xfree86"}, + {"Xorg", "xorg"}, {"Microsoft", "microsoft"}, {"Omega", "omega"}, {"Font21", "hwan"}, diff --git a/mkfontscale.c b/mkfontscale.c index 721a6a9..464224c 100644 --- a/mkfontscale.c +++ b/mkfontscale.c @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.4 2004/03/05 13:41:16 eich Exp $ */ +/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.2 2004/04/23 19:54:36 eich Exp $ */ /* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */ #include <stdio.h> diff --git a/mkfontscale.man b/mkfontscale.man index 5b42eb9..6cb3b9f 100644 --- a/mkfontscale.man +++ b/mkfontscale.man @@ -144,8 +144,10 @@ file even if it has been hand-edited. is equivalent to .BR mkfontdir . .SH AUTHOR -.B Mkfontscale -was written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86 +The version of +.B mkfontscale +included in this X.Org Foundataion release +was originally written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86 project. The functionality of this program was inspired by the .B ttmkfdir utility by Joerg Pommnitz. |