From 8f0babf8450aa8097e063e13c95b1581843b2dd8 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:22 +0000 Subject: Merging XORG-CURRENT into trunk --- include/X11/ICE/ICElib.h | 2 +- include/X11/ICE/ICEmsg.h | 2 +- include/X11/ICE/ICEutil.h | 2 +- src/ICElibint.h | 2 +- src/authutil.c | 3 ++- src/connect.c | 2 +- src/error.c | 2 +- src/getauth.c | 2 +- src/globals.h | 2 +- src/iceauth.c | 2 +- src/listenwk.c | 2 +- src/misc.c | 2 +- src/process.c | 2 +- src/protosetup.c | 2 +- src/setauth.c | 2 +- src/shutdown.c | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h index 34b05eb..200cd19 100644 --- a/include/X11/ICE/ICElib.h +++ b/include/X11/ICE/ICElib.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElib.h,v 3.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h index 2146a6d..ddae027 100644 --- a/include/X11/ICE/ICEmsg.h +++ b/include/X11/ICE/ICEmsg.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEMSG_H_ #define _ICEMSG_H_ diff --git a/include/X11/ICE/ICEutil.h b/include/X11/ICE/ICEutil.h index e63a649..5e1d2af 100644 --- a/include/X11/ICE/ICEutil.h +++ b/include/X11/ICE/ICEutil.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEUTIL_H_ #define _ICEUTIL_H_ diff --git a/src/ICElibint.h b/src/ICElibint.h index d595680..fd84fde 100644 --- a/src/ICElibint.h +++ b/src/ICElibint.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.7 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */ #ifndef _ICELIBINT_H_ #define _ICELIBINT_H_ diff --git a/src/authutil.c b/src/authutil.c index 7fb9bd1..2ef893f 100644 --- a/src/authutil.c +++ b/src/authutil.c @@ -1,4 +1,5 @@ /* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ +/* $XdotOrg$ */ /****************************************************************************** @@ -26,7 +27,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/authutil.c,v 3.10 2003/11/26 21:48:18 herrb Exp $ */ +/* $XFree86: authutil.c,v 3.9 2002/05/31 18:45:41 dawes Exp $ */ #include #include "ICElibint.h" diff --git a/src/connect.c b/src/connect.c index 2070ece..e2eb7ad 100644 --- a/src/connect.c +++ b/src/connect.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/connect.c,v 3.10 2002/12/02 21:50:29 tsi Exp $ */ +/* $XFree86: xc/lib/ICE/connect.c,v 3.9 2001/12/14 19:53:35 dawes Exp $ */ #include #include "ICElibint.h" diff --git a/src/error.c b/src/error.c index b9f527a..09fbbb2 100644 --- a/src/error.c +++ b/src/error.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/error.c,v 1.6 2001/12/14 19:53:35 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/error.c,v 1.5 2001/10/28 03:32:28 tsi Exp $ */ #include #include "ICElibint.h" diff --git a/src/getauth.c b/src/getauth.c index 9c3e52a..15db492 100644 --- a/src/getauth.c +++ b/src/getauth.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/getauth.c,v 1.3 2001/12/14 19:53:35 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/getauth.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */ #include #include "ICElibint.h" diff --git a/src/globals.h b/src/globals.h index 129bf00..0532f55 100644 --- a/src/globals.h +++ b/src/globals.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/globals.h,v 1.4 2001/12/14 19:53:35 dawes Exp $ */ extern void _IceDefaultErrorHandler (); extern void _IceDefaultIOErrorHandler (); diff --git a/src/iceauth.c b/src/iceauth.c index d03cf25..c3e78a3 100644 --- a/src/iceauth.c +++ b/src/iceauth.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/iceauth.c,v 3.6 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/iceauth.c,v 3.5 2001/12/14 19:53:36 dawes Exp $ */ #include #include "ICElibint.h" diff --git a/src/listenwk.c b/src/listenwk.c index f01cb14..ee08723 100644 --- a/src/listenwk.c +++ b/src/listenwk.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/ICE/listenwk.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/listenwk.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ /* Author: Ralph Mor, X Consortium */ diff --git a/src/misc.c b/src/misc.c index 1c28e8d..e174b60 100644 --- a/src/misc.c +++ b/src/misc.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/misc.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/misc.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/src/process.c b/src/process.c index d733017..37f97d7 100644 --- a/src/process.c +++ b/src/process.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/process.c,v 3.10 2003/10/23 21:31:49 tsi Exp $ */ +/* $XFree86: xc/lib/ICE/process.c,v 3.9tsi Exp $ */ #include #include "ICElibint.h" 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 #include "ICElibint.h" diff --git a/src/setauth.c b/src/setauth.c index 48b4d3a..1811384 100644 --- a/src/setauth.c +++ b/src/setauth.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/setauth.c,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/setauth.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */ #include #include "ICElibint.h" diff --git a/src/shutdown.c b/src/shutdown.c index 8b52418..103aa47 100644 --- a/src/shutdown.c +++ b/src/shutdown.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/shutdown.c,v 3.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/shutdown.c,v 3.3 2001/08/01 00:44:37 tsi Exp $ */ #include #include "ICElibint.h" -- cgit v1.2.3