From d4e1fb367080b5c6513d74eaf872a13b99fe65b7 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 15 Apr 2004 10:17:37 +0000
Subject: Merged changes from RELEASE-1 branch

---
 data.h          | 1 +
 mkfontscale.man | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/data.h b/data.h
index 59521ac..326cf85 100644
--- a/data.h
+++ b/data.h
@@ -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.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.
-- 
cgit v1.2.3