From e8a005881cad65292bd73a2ed8f7454ce9d461f0 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:17 +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/cursor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cursor.c') diff --git a/src/cursor.c b/src/cursor.c index 89583ab..be0c2e6 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -22,7 +22,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/twm/cursor.c,v 1.5 2001/12/14 20:01:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/cursor.c,v 1.4 2001/01/17 23:45:05 dawes Exp $ */ /*********************************************************************** * -- cgit v1.2.3