From 55185f35a75e6aad933e6faedd68bc14dfb94ccc Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 19:54:36 +0000 Subject: Merging XORG-CURRENT into trunk --- data.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data.h') diff --git a/data.h b/data.h index e006271..326cf85 100644 --- a/data.h +++ b/data.h @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/data.h,v 1.4 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/data.h,v 1.3 2003/04/30 20:39:43 herrb Exp $ */ #ifndef _MKS_DATA_H_ #define _MKS_DATA_H_ 1 @@ -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"}, -- cgit v1.2.3