From ee2802290fb890f4ea8a98bcf4d27e20ae8a23db Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:32:14 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- iceauth.c | 2 +- iceauth.h | 2 +- iceauth.man | 2 +- process.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iceauth.c b/iceauth.c index ceabaf0..cd49952 100644 --- a/iceauth.c +++ b/iceauth.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Original Author of "xauth" : Jim Fulton, MIT X Consortium * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.5 2001/12/14 20:00:48 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.4 2001/01/17 23:44:54 dawes Exp $ */ #include "iceauth.h" diff --git a/iceauth.h b/iceauth.h index a9308df..1e7764f 100644 --- a/iceauth.h +++ b/iceauth.h @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.5 2001/12/14 20:00:48 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.4 2001/07/25 15:05:13 dawes Exp $ */ #include #include diff --git a/iceauth.man b/iceauth.man index 0b99d4d..ffe6432 100644 --- a/iceauth.man +++ b/iceauth.man @@ -24,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.7 2001/12/14 20:00:48 dawes Exp $ +.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.6 2001/01/27 18:21:03 dawes Exp $ .\" .TH ICEAUTH 1 __xorgversion__ .SH NAME diff --git a/process.c b/process.c index 42b5ae9..9985500 100644 --- a/process.c +++ b/process.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/process.c,v 3.8 2002/05/31 18:46:07 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/process.c,v 3.7 2001/12/14 20:00:49 dawes Exp $ */ #include "iceauth.h" #include -- cgit v1.2.3