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

---
 save.c      | 2 +-
 smproxy.c   | 2 +-
 smproxy.h   | 2 +-
 smproxy.man | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/save.c b/save.c
index c594b84..e7061d7 100644
--- a/save.c
+++ b/save.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/smproxy/save.c,v 1.8 2001/12/14 20:01:05 dawes Exp $ */
+/* $XFree86: xc/programs/smproxy/save.c,v 1.7 2001/01/17 23:45:04 dawes Exp $ */
 
 #include "smproxy.h"
 #ifdef HAS_MKSTEMP
diff --git a/smproxy.c b/smproxy.c
index a416465..ab94222 100644
--- a/smproxy.c
+++ b/smproxy.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.9 2001/12/14 20:01:05 dawes Exp $ */
+/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.8 2001/10/28 03:34:25 tsi Exp $ */
 
 #include "smproxy.h"
 #include <unistd.h>
diff --git a/smproxy.h b/smproxy.h
index ce58ff0..90d2bbf 100644
--- a/smproxy.h
+++ b/smproxy.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.6 2001/12/14 20:01:05 dawes Exp $ */
+/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.5 2001/07/25 15:05:16 dawes Exp $ */
 
 #include <X11/Xosdefs.h>
 #include <X11/Xfuncs.h>
diff --git a/smproxy.man b/smproxy.man
index d18650d..543c6cf 100644
--- a/smproxy.man
+++ b/smproxy.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.7 2001/12/14 20:01:05 dawes Exp $
+.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.6 2001/01/27 18:21:06 dawes Exp $
 .\"
 .TH XSM 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3