From e1776973e1fbb3d6a0b043a3b34ff56c61416a7f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:30 +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/Error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Error.c') diff --git a/src/Error.c b/src/Error.c index 498ddfd..d0886ef 100644 --- a/src/Error.c +++ b/src/Error.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Error.c,v 3.14 2003/05/27 22:26:42 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Error.c,v 3.13tsi Exp $ */ /* -- cgit v1.2.3