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

(limited to 'src/r128_reg.h')

diff --git a/src/r128_reg.h b/src/r128_reg.h
index 8f486e8..a0f21cf 100644
--- a/src/r128_reg.h
+++ b/src/r128_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h,v 1.17 2003/09/28 20:15:54 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h,v 1.16 2003/04/06 20:36:36 martin Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
-- 
cgit v1.2.3