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

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

diff --git a/viewres.c b/viewres.c
index f403ceb..211e652 100644
--- a/viewres.c
+++ b/viewres.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/viewres/viewres.c,v 1.7 2003/09/08 20:49:47 herrb Exp $ */
+/* $XFree86: xc/programs/viewres/viewres.c,v 1.6 2003/05/27 22:26:58 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/viewres.man b/viewres.man
index 5aacd93..ef290ce 100644
--- a/viewres.man
+++ b/viewres.man
@@ -25,7 +25,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/viewres/viewres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
+.\" $XFree86: xc/programs/viewres/viewres.man,v 1.3 2001/01/27 18:21:07 dawes Exp $
 .\"
 .TH VIEWRES 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3