From 38f37a3854c401f1347b86e1f676d0f62cc30868 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 4 Mar 2004 17:48:46 +0000 Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich). --- dix/atom.c | 2 +- dix/colormap.c | 4 ++-- dix/cursor.c | 2 +- dix/devices.c | 2 +- dix/dispatch.c | 2 +- dix/dispatch.h | 2 +- dix/dixfonts.c | 4 ++-- dix/dixutils.c | 2 +- dix/events.c | 2 +- dix/extension.c | 2 +- dix/gc.c | 2 +- dix/globals.c | 4 ++-- dix/grabs.c | 2 +- dix/main.c | 4 ++-- dix/pixmap.c | 2 +- dix/privates.c | 2 +- dix/property.c | 2 +- dix/resource.c | 2 +- dix/swaprep.c | 2 +- dix/swapreq.c | 2 +- dix/tables.c | 2 +- dix/window.c | 2 +- dix/xpstubs.c | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) (limited to 'dix') diff --git a/dix/atom.c b/dix/atom.c index 66c045583..7509f0a24 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/colormap.c b/dix/colormap.c index a2bc2d5fa..4ee555258 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/cursor.c b/dix/cursor.c index 2ef9e5e24..fc81a5197 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/devices.c b/dix/devices.c index 46af5eabc..d4e4be823 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.21 2003/11/17 22:20:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.20 2001/12/14 19:59:30 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/dispatch.c b/dix/dispatch.c index f9ab9c458..a5dd91794 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -69,7 +69,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */ #ifdef PANORAMIX_DEBUG #include diff --git a/dix/dispatch.h b/dix/dispatch.h index d144c6c70..ba43bdca2 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.3 2002/02/19 11:09:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/dix/dixfonts.c b/dix/dixfonts.c index aa03e7360..68fd60f82 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/dix/dixutils.c b/dix/dixutils.c index 38cfd4e0d..40f80d348 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.13 2003/01/12 02:44:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/events.c b/dix/events.c index 2853e1013..b7cdbdc57 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.52 2004/01/23 07:23:34 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/extension.c b/dix/extension.c index 36f053f02..3fcf31b8e 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/gc.c b/dix/gc.c index 11f215c8d..ee787bca3 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.10 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.9 2001/12/14 19:59:32 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/globals.c b/dix/globals.c index 293c61bd5..07f43196a 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/grabs.c b/dix/grabs.c index 7a9fbcdb5..6eba43d1f 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ #include "X.h" #include "misc.h" diff --git a/dix/main.c b/dix/main.c index 945bb562e..e31195c70 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5 2004/02/25 21:46:40 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5 2004/02/25 21:46:40 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/pixmap.c b/dix/pixmap.c index fda07801c..2df5d7374 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5 2001/12/14 19:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/privates.c b/dix/privates.c index 2d0885846..64d705e24 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.8 2001/12/14 19:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/property.c b/dix/property.c index 1af6156b5..f3d0edc9e 100644 --- a/dix/property.c +++ b/dix/property.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.13 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/resource.c b/dix/resource.c index d885c03ef..c3ec1b628 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -72,7 +72,7 @@ SOFTWARE. * 1, and an otherwise arbitrary ID in the low 22 bits, we can create a * resource "owned" by the client. */ -/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 494471730..6bde83b96 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.8 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.7 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/swapreq.c b/dix/swapreq.c index 358ec8139..d795a3dea 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.4 2001/12/14 19:59:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/tables.c b/dix/tables.c index a76bc7535..6037b1220 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.6 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/window.c b/dix/window.c index eeb45bc8a..d35f18d2b 100644 --- a/dix/window.c +++ b/dix/window.c @@ -71,7 +71,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.37 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ #include "misc.h" #include "scrnintstr.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index db6de103c..dac3205fb 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */ +/* $XFree86$ */ /* Copyright 1996, 1998 The Open Group -- cgit v1.2.3