From 7d27a815b614d93698b6d3de4c8a102e35d9fe99 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:40:24 +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/i810_memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/i810_memory.c')

diff --git a/src/i810_memory.c b/src/i810_memory.c
index bb67c434..0ff63a5b 100644
--- a/src/i810_memory.c
+++ b/src/i810_memory.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.28 2003/09/24 02:43:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.27 2002/12/10 01:27:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-- 
cgit v1.2.3