diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:49 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:49 +0000 |
commit | 4665171591908478203b5618735678459951b16b (patch) | |
tree | 94095166dfe50ba3e4f9ed6131bdffd53098c5d3 | |
parent | bc01b7092bbdf3a6333538737f9a76778935535a (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
-rw-r--r-- | iceauth.c | 2 | ||||
-rw-r--r-- | iceauth.h | 2 | ||||
-rw-r--r-- | iceauth.man | 2 | ||||
-rw-r--r-- | process.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -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" @@ -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 <stdio.h> #include <X11/Xos.h> 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 @@ -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 <ctype.h> |