From fb768609ea31ca228c1d97a997bbcb62a496984b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:42 +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). --- src/util/atom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/atom.c') diff --git a/src/util/atom.c b/src/util/atom.c index 3863c94..36a2f44 100644 --- a/src/util/atom.c +++ b/src/util/atom.c @@ -25,7 +25,7 @@ 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/lib/font/util/atom.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/atom.c,v 1.9 2002/09/19 13:22:00 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium -- cgit v1.2.3