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

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

diff --git a/xlsclients.c b/xlsclients.c
index 447af85..3effbf4 100644
--- a/xlsclients.c
+++ b/xlsclients.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.6 2001/12/14 20:02:09 dawes Exp $ */
+/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xlsclients.man b/xlsclients.man
index 4d977e6..13e93a1 100644
--- a/xlsclients.man
+++ b/xlsclients.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.8 2001/12/14 20:02:08 dawes Exp $
+.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.7 2001/01/27 18:21:18 dawes Exp $
 .\"
 .TH XLSCLIENTS 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3