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

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

(limited to 'src/nv_const.h')

diff --git a/src/nv_const.h b/src/nv_const.h
index f4ab437..bd01635 100644
--- a/src/nv_const.h
+++ b/src/nv_const.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.7 2003/07/31 20:24:29 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.6 2001/12/07 00:09:55 mvojkovi Exp $ */
 
 #ifndef __NV_CONST_H__
 #define __NV_CONST_H__
-- 
cgit v1.2.3