From 0340d3bd8ce68c698def6cf215655e4c0f53741a Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:06 +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/sm_error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sm_error.c') diff --git a/src/sm_error.c b/src/sm_error.c index 728de79..8cd7989 100644 --- a/src/sm_error.c +++ b/src/sm_error.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/SM/sm_error.c,v 1.3 2001/12/14 19:53:55 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_error.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium -- cgit v1.2.3