From 54ec87ac9a45f940b51ca459181bee9d5706ede8 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
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).

---
 log.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'log.h')

diff --git a/log.h b/log.h
index 070a422..d1f68f9 100644
--- a/log.h
+++ b/log.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/log.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/log.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _LOG_H_
 #define _LOG_H_
-- 
cgit v1.2.3