[xorg-commit-diffs] xc/programs/mkfontscale data.h, 1.1.4.2, 1.1.4.3 mkfontscale.man, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/mkfontscale
In directory pdx:/home/eich/tstbuild/xc/programs/mkfontscale

Modified Files:
      Tag: XORG-CURRENT
	data.h mkfontscale.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: data.h
===================================================================
RCS file: /cvs/xorg/xc/programs/mkfontscale/data.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/data.h	5 Mar 2004 13:41:16 -0000	1.1.4.2
+++ b/data.h	15 Apr 2004 10:17:37 -0000	1.1.4.3
@@ -39,6 +39,7 @@
      {"International Typeface Corporation", "itc"},
      {"Tiro Typeworks", "tiro"},
      {"XFree86", "xfree86"},
+     {"Xorg", "xorg"},
      {"Microsoft", "microsoft"},
      {"Omega", "omega"},
      {"Font21", "hwan"},

Index: mkfontscale.man
===================================================================
RCS file: /cvs/xorg/xc/programs/mkfontscale/mkfontscale.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/mkfontscale.man	5 Mar 2004 13:41:16 -0000	1.1.4.2
+++ b/mkfontscale.man	15 Apr 2004 10:17:37 -0000	1.1.4.3
@@ -144,8 +144,10 @@
 is equivalent to
 .BR mkfontdir .
 .SH AUTHOR
-.B Mkfontscale
-was written by Juliusz Chroboczek <jch at xfree86.org> for the XFree86
+The version of
+.B mkfontscale
+included in this X.Org Foundataion release 
+was originally written by Juliusz Chroboczek <jch at xfree86.org> for the XFree86
 project.  The functionality of this program was inspired by the
 .B ttmkfdir
 utility by Joerg Pommnitz.