From 54ec87ac9a45f940b51ca459181bee9d5706ede8 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:38 +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). --- saveutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'saveutil.h') diff --git a/saveutil.h b/saveutil.h index 86a040a..31af135 100644 --- a/saveutil.h +++ b/saveutil.h @@ -23,7 +23,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/xsm/saveutil.h,v 1.7 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/saveutil.h,v 1.6 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _SAVEUTIL_H_ #define _SAVEUTIL_H_ -- cgit v1.2.3