diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
commit | a130220928af59d6685aed704ba8b2d9861fa736 (patch) | |
tree | 4483a2b0b58628e8bd4d2659b7218e13c46e0376 | |
parent | e460c46c74c37124032c2663c68965fd58f6a528 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | AA16.c | 2 | ||||
-rw-r--r-- | AA32.c | 2 | ||||
-rw-r--r-- | AA8.c | 2 | ||||
-rw-r--r-- | Alloc.c | 2 | ||||
-rw-r--r-- | AofA8.c | 2 | ||||
-rw-r--r-- | CmpKey.c | 2 | ||||
-rw-r--r-- | DA16.c | 2 | ||||
-rw-r--r-- | DecKey.c | 2 | ||||
-rw-r--r-- | Fill.c | 2 | ||||
-rw-r--r-- | Flush.c | 2 | ||||
-rw-r--r-- | GenKey.c | 2 | ||||
-rw-r--r-- | IncKey.c | 2 | ||||
-rw-r--r-- | RaA16.c | 2 | ||||
-rw-r--r-- | RaA32.c | 2 | ||||
-rw-r--r-- | RaA8.c | 2 | ||||
-rw-r--r-- | RaAoA8.c | 2 | ||||
-rw-r--r-- | Unwrap.c | 2 | ||||
-rw-r--r-- | WC16.c | 2 | ||||
-rw-r--r-- | WC32.c | 2 | ||||
-rw-r--r-- | WC8.c | 2 | ||||
-rw-r--r-- | Whead.c | 2 | ||||
-rw-r--r-- | Wrap.c | 2 | ||||
-rw-r--r-- | Wrap.h | 2 | ||||
-rw-r--r-- | include/X11/Xdmcp.h | 2 |
24 files changed, 24 insertions, 24 deletions
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.5 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */ @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.6 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.5 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.9 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.8 2001/07/23 13:15:42 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.7 2001/07/23 13:15:42 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.4 2001/12/14 19:54:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> @@ -4,7 +4,7 @@ * header file for compatibility with something useful */ -/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.4 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ typedef unsigned char auth_cblock[8]; /* block size */ diff --git a/include/X11/Xdmcp.h b/include/X11/Xdmcp.h index b8cab05..9c40619 100644 --- a/include/X11/Xdmcp.h +++ b/include/X11/Xdmcp.h @@ -14,7 +14,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.8 2003/11/22 04:50:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.7 2003/07/09 15:27:29 tsi Exp $ */ #ifndef _XDMCP_H_ #define _XDMCP_H_ |