From 3586c3c7955365a2af0b8a286ea0d0488ddfd137 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:26:46 +0000
Subject: Merging XORG-CURRENT into trunk

---
 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