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

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

(limited to 'src/mga_macros.h')

diff --git a/src/mga_macros.h b/src/mga_macros.h
index d985081..9515879 100644
--- a/src/mga_macros.h
+++ b/src/mga_macros.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.22 2002/02/20 17:17:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */
 
 #ifndef _MGA_MACROS_H_
 #define _MGA_MACROS_H_
-- 
cgit v1.2.3