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

---
 src/mga_merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mga_merge.c')

diff --git a/src/mga_merge.c b/src/mga_merge.c
index ab3d20e..b06466c 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.5 2003/11/02 04:24:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.4 2003/09/24 02:43:24 dawes Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
-- 
cgit v1.2.3