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_dri.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/r128_dri.h')

diff --git a/src/r128_dri.h b/src/r128_dri.h
index 1339a450..64345d3c 100644
--- a/src/r128_dri.h
+++ b/src/r128_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h,v 1.7 2002/10/30 12:52:12 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h,v 1.6 2001/03/21 17:02:21 dawes Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
-- 
cgit v1.2.3