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

---
 render.h      | 2 +-
 renderproto.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/render.h b/render.h
index a596667..e44754c 100644
--- a/render.h
+++ b/render.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/render.h,v 1.11 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/renderproto.h b/renderproto.h
index 7717d9f..4b5da46 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.13 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
-- 
cgit v1.2.3