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

---
 src/protosetup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/protosetup.c')

diff --git a/src/protosetup.c b/src/protosetup.c
index 287932a..fa36319 100644
--- a/src/protosetup.c
+++ b/src/protosetup.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 Author: Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/lib/ICE/protosetup.c,v 1.3 2001/12/14 19:53:36 dawes Exp $ */
+/* $XFree86: xc/lib/ICE/protosetup.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */
 
 #include <X11/ICE/ICElib.h>
 #include "ICElibint.h"
-- 
cgit v1.2.3