From 06bbfeac0401f34ce08fb5eaafe4d8db83b8f7a5 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:30:51 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

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

(limited to 'src/riva_local.h')

diff --git a/src/riva_local.h b/src/riva_local.h
index efe0c7e..b060acc 100644
--- a/src/riva_local.h
+++ b/src/riva_local.h
@@ -36,7 +36,7 @@
 |*     those rights set forth herein.                                        *|
 |*                                                                           *|
  \***************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_local.h,v 1.2 2003/11/03 05:11:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_local.h,v 1.1tsi Exp $ */
 
 #ifndef __RIVA_LOCAL_H__
 #define __RIVA_LOCAL_H__
-- 
cgit v1.2.3