summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:41 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:41 +0000
commit5bfa1bbc49ed45df16e4850957bbaf91a41ffb9e (patch)
treef69508275cf532d568712aaf92913cd8abe6ce5f
parente8482c23752efa7d69ce19b5a7cb5dd2695a8e8b (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
-rw-r--r--xdpyinfo.c2
-rw-r--r--xdpyinfo.man2
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