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

---
 dga.c   | 2 +-
 dga.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dga.c b/dga.c
index 35ab604..e2a7ce4 100644
--- a/dga.c
+++ b/dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xf86dga/dga.c,v 3.20 2002/05/31 18:46:11 dawes Exp $ */
+/* $XFree86: xc/programs/xf86dga/dga.c,v 3.19 2001/10/28 03:34:32 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Intrinsic.h>
diff --git a/dga.man b/dga.man
index 66d0df5..c7d9fc1 100644
--- a/dga.man
+++ b/dga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.5 2001/01/27 18:21:12 dawes Exp $
+.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.4 1997/11/08 16:24:37 hohndel Exp $
 .\"
 .TH dga 1 __vendorversion__
 .SH NAME
-- 
cgit v1.2.3