From e5ba473d7580881bc6baf6ed8622c73a1392df4b Mon Sep 17 00:00:00 2001
From: Deron Johnson <deron.johnson@sun.com>
Date: Thu, 17 Feb 2005 22:44:40 +0000
Subject: Joined with branch XORG-6_8_2.

---
 src/r128_dripriv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/r128_dripriv.h')

diff --git a/src/r128_dripriv.h b/src/r128_dripriv.h
index 7f84987..043e7bd 100644
--- a/src/r128_dripriv.h
+++ b/src/r128_dripriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.3 2000/11/18 19:37:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.2 2000/11/09 03:24:35 martin Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
-- 
cgit v1.2.3