From 58890f97461e43807bebec89e1025f7f45ab4356 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:13 +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).

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

(limited to 'editresP.h')

diff --git a/editresP.h b/editresP.h
index 8973fff..0719511 100644
--- a/editresP.h
+++ b/editresP.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Chris D. Peterson, MIT X Consortium
  */
-/* $XFree86: xc/programs/editres/editresP.h,v 1.7 2001/12/14 20:00:42 dawes Exp $ */
+/* $XFree86: xc/programs/editres/editresP.h,v 1.6 2001/07/25 15:05:13 dawes Exp $ */
 
 #include <X11/Xmu/EditresP.h>
 #include <X11/Xresource.h>
-- 
cgit v1.2.3