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

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

diff --git a/xdpyinfo.c b/xdpyinfo.c
index 33887ce..001cbd1 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Jim Fulton, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.30 2003/11/17 22:20:51 dawes Exp $ */
+/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.29 2003/04/14 20:38:10 herrb Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/xdpyinfo.man b/xdpyinfo.man
index 07a6e72..ca4326c 100644
--- a/xdpyinfo.man
+++ b/xdpyinfo.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.8 2001/12/14 20:01:30 dawes Exp $
+.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.7 2001/01/27 18:21:11 dawes Exp $
 .\"
 .TH XDPYINFO 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3