From 5881d556fee5df2352f6868be6be4ab9977c4704 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:36 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- xlsfonts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlsfonts.c') diff --git a/xlsfonts.c b/xlsfonts.c index fa22341..2acbcb2 100644 --- a/xlsfonts.c +++ b/xlsfonts.c @@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.10 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.9 2003/09/08 14:25:33 eich Exp $ */ #include #include -- cgit v1.2.3