diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index ae3276a026..106a6464d7 100644 --- a/GL/apple/aglGlx.c +++ b/GL/apple/aglGlx.c @@ -32,7 +32,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #include "quartzCommon.h" #include diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c index b1292b6064..c4d235a477 100644 --- a/GL/apple/indirect.c +++ b/GL/apple/indirect.c @@ -34,7 +34,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ #include "dri.h" #include "quartz.h" diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c index 47988a5957..12d1abe569 100644 --- a/GL/glx/g_disptab.c +++ b/GL/glx/g_disptab.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h index e311d98c38..25c233ac75 100644 --- a/GL/glx/g_disptab.h +++ b/GL/glx/g_disptab.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_h_ #define _GLX_g_disptab_h_ diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c index 472a2d443e..1fe07f40e9 100644 --- a/GL/glx/g_disptab_EXT.c +++ b/GL/glx/g_disptab_EXT.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h index 3aca9347fa..89184c1b66 100644 --- a/GL/glx/g_disptab_EXT.h +++ b/GL/glx/g_disptab_EXT.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_EXT_h_ #define _GLX_g_disptab_EXT_h_ diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c index 88834bf39b..a599423cc7 100644 --- a/GL/glx/g_render.c +++ b/GL/glx/g_render.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c index ac4cb0b738..2a8d0c02f7 100644 --- a/GL/glx/g_renderswap.c +++ b/GL/glx/g_renderswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.8 2004/01/28 18:11:50 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/g_single.c b/GL/glx/g_single.c index 5bcec133c2..ce446470f9 100644 --- a/GL/glx/g_single.c +++ b/GL/glx/g_single.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/g_singleswap.c b/GL/glx/g_singleswap.c index 34515997e8..71722e57f6 100644 --- a/GL/glx/g_singleswap.c +++ b/GL/glx/g_singleswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/global.c b/GL/glx/global.c index 9cd011ec91..73c2e8f3f2 100644 --- a/GL/glx/global.c +++ b/GL/glx/global.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxbuf.c b/GL/glx/glxbuf.c index 6e6f6142bc..3488476c93 100644 --- a/GL/glx/glxbuf.c +++ b/GL/glx/glxbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxbuf.h b/GL/glx/glxbuf.h index a298b34717..611602f38b 100644 --- a/GL/glx/glxbuf.h +++ b/GL/glx/glxbuf.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ #ifndef _glxbuf_h_ #define _glxbuf_h_ diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index 57c064d19a..df41549915 100644 --- a/GL/glx/glxcmds.c +++ b/GL/glx/glxcmds.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.13 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index 0126b46994..8c0f1f0915 100644 --- a/GL/glx/glxcmdsswap.c +++ b/GL/glx/glxcmdsswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.11 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.10 2004/01/28 18:11:50 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h index 6454b49525..5eb72177e5 100644 --- a/GL/glx/glxcontext.h +++ b/GL/glx/glxcontext.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */ #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h index a2c806f446..972a6045fb 100644 --- a/GL/glx/glxdrawable.h +++ b/GL/glx/glxdrawable.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h index 3c1e93c61b..5aad9c3e7d 100644 --- a/GL/glx/glxerror.h +++ b/GL/glx/glxerror.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ #ifndef _GLX_error_h_ #define _GLX_error_h_ diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index ac08c3df92..796663e9b2 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.10 2004/01/28 22:36:05 alanh Exp $ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $ ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index fb0d21b857..210fbb88c4 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.8 2004/02/09 23:46:31 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */ #ifndef _glxext_h_ #define _glxext_h_ diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c index 4ce952d519..789eda52b9 100644 --- a/GL/glx/glxfb.c +++ b/GL/glx/glxfb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxfb.h b/GL/glx/glxfb.h index 44a72a3e2f..a0011a9ce5 100644 --- a/GL/glx/glxfb.h +++ b/GL/glx/glxfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ #ifndef _glxfb_h_ #define _glxfb_h_ diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c index 7ec1134cd0..b38456f6ff 100644 --- a/GL/glx/glximports.c +++ b/GL/glx/glximports.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glximports.h b/GL/glx/glximports.h index e1a65a70eb..09d8340af5 100644 --- a/GL/glx/glximports.h +++ b/GL/glx/glximports.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glximports_h_ #define _glximports_h_ diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c index 0c3ea25a71..a389099228 100644 --- a/GL/glx/glxmem.c +++ b/GL/glx/glxmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxmem.h b/GL/glx/glxmem.h index 93a2775596..8890467211 100644 --- a/GL/glx/glxmem.h +++ b/GL/glx/glxmem.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ #ifndef _glxmem_h_ #define _glxmem_h_ diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c index b21d4ade9a..cca2105ba1 100644 --- a/GL/glx/glxpix.c +++ b/GL/glx/glxpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxpix.h b/GL/glx/glxpix.h index d7a9afab03..2147a6d038 100644 --- a/GL/glx/glxpix.h +++ b/GL/glx/glxpix.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ #ifndef _glxpix_h_ #define _glxpix_h_ diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 1a64b0e192..f78b4a2843 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxscreens.h b/GL/glx/glxscreens.h index 99f76dc381..42dc66e083 100644 --- a/GL/glx/glxscreens.h +++ b/GL/glx/glxscreens.h @@ -1,7 +1,7 @@ #ifndef _GLX_screens_h_ #define _GLX_screens_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index 9446aefcc6..be9e40f5a0 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.6 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _GLX_server_h_ #define _GLX_server_h_ diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c index ebc9a2bfcc..7aafd00653 100644 --- a/GL/glx/glxutil.c +++ b/GL/glx/glxutil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h index 1f736f0f12..67bfb06f9d 100644 --- a/GL/glx/glxutil.h +++ b/GL/glx/glxutil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h index 322ee18c8a..894391003f 100644 --- a/GL/glx/impsize.h +++ b/GL/glx/impsize.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _impsize_h_ #define _impsize_h_ diff --git a/GL/glx/render2.c b/GL/glx/render2.c index 56453ceff7..d4c523fea0 100644 --- a/GL/glx/render2.c +++ b/GL/glx/render2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.8 2004/02/03 23:04:08 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c index b272c6ba9c..7c94b52682 100644 --- a/GL/glx/render2swap.c +++ b/GL/glx/render2swap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.7 2004/02/03 23:04:08 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.6 2002/01/14 22:47:08 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c index ad5625dd6f..5ffa47ddb3 100644 --- a/GL/glx/renderpix.c +++ b/GL/glx/renderpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c index 3b0e1f6b79..81d4e375f2 100644 --- a/GL/glx/renderpixswap.c +++ b/GL/glx/renderpixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c index e73135db3b..aa784b5fc8 100644 --- a/GL/glx/rensize.c +++ b/GL/glx/rensize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.7 2004/01/28 18:11:53 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c index 04ffff6bcd..f402bb217d 100644 --- a/GL/glx/rensizetab.c +++ b/GL/glx/rensizetab.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.6 2004/02/03 23:04:08 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 3120ae1717..c757d60bdb 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.9 2004/02/11 09:18:15 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index 5b76b91e08..c8c496871c 100644 --- a/GL/glx/single2swap.c +++ b/GL/glx/single2swap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.8 2004/02/09 23:46:31 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c index 85be77d85d..4459d81b1c 100644 --- a/GL/glx/singlepix.c +++ b/GL/glx/singlepix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c index 2b488312e3..b4370a2291 100644 --- a/GL/glx/singlepixswap.c +++ b/GL/glx/singlepixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlesize.c b/GL/glx/singlesize.c index 3f30548718..448fa1aef4 100644 --- a/GL/glx/singlesize.c +++ b/GL/glx/singlesize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.8 2004/02/09 19:51:32 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.7tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h index 8293380949..15941ec4bc 100644 --- a/GL/glx/singlesize.h +++ b/GL/glx/singlesize.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ #ifndef _singlesize_h_ #define _singlesize_h_ diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h index 62fc437617..6984b45ab6 100644 --- a/GL/glx/unpack.h +++ b/GL/glx/unpack.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */ #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c index 3ea767d2bd..cb87d552de 100644 --- a/GL/glx/xfont.c +++ b/GL/glx/xfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h index c502880558..c10cf4b64a 100644 --- a/GL/include/GL/glx_ansic.h +++ b/GL/include/GL/glx_ansic.h @@ -1,7 +1,7 @@ #ifndef _glx_ansic_h_ #define _glx_ansic_h_ -/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h index 7a467b9b5a..08e2a9f6cc 100644 --- a/GL/include/GL/xf86glx.h +++ b/GL/include/GL/xf86glx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 170726bff6..2407059890 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 57ad13c0b3..7a180278db 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH. diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index 435ca71f68..cab6d5e110 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86$ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1992 by diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index db06e1cc2b..3c9385794e 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86$ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/Xext/EVI.c b/Xext/EVI.c index 09aa03b645..820312cca0 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h index dfe4423f85..db5655f97d 100644 --- a/Xext/EVIstruct.h +++ b/Xext/EVIstruct.h @@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */ #ifndef EVI_STRUCT_H #define EVI_STRUCT_H diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 8718e3630b..1c05b815f8 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group diff --git a/Xext/appgroup.h b/Xext/appgroup.h index d292cf5095..05c9ef124e 100644 --- a/Xext/appgroup.h +++ b/Xext/appgroup.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */ +/* $XFree86$ */ void XagClientStateChange( CallbackListPtr* pcbl, diff --git a/Xext/bigreq.c b/Xext/bigreq.c index ae73783d99..893fe9d136 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/Xext/cup.c b/Xext/cup.c index 70c6fa6101..d5475d3d88 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -24,7 +24,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/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/dpms.c b/Xext/dpms.c index 584c32b22f..e04f3470d7 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -33,7 +33,7 @@ Equipment Corporation. * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00 */ -/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ #include "X.h" #include "Xproto.h" @@ -189,7 +189,8 @@ ProcDPMSSetTimeouts(client) DPMSStandbyTime = stuff->standby * MILLI_PER_SECOND; DPMSSuspendTime = stuff->suspend * MILLI_PER_SECOND; DPMSOffTime = stuff->off * MILLI_PER_SECOND; - + SetDPMSTimers(); + return(client->noClientException); } diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index b8260491e0..36ad391dad 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */ /* Prototypes for functions that the DDX must provide */ diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index bc85c16ca5..24086084ac 100644 --- a/Xext/dpmsstubs.c +++ b/Xext/dpmsstubs.c @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */ typedef int Bool; diff --git a/Xext/fontcache.c b/Xext/fontcache.c index 7c3f5a800f..2b7798f298 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -27,7 +27,7 @@ * * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 4308037be3..be08abea77 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 99400c90a3..3e6f9dc204 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 9c531c2924..6c3e8be6bb 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index b911d7ff50..8fd6c36461 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 89a8a2d2e9..d9e36d47e7 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */ #define NEED_REPLIES #include diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index d01b0b8540..1222bbaf20 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index e3ea803e68..b738271509 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */ #include #include "X.h" diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h index d15fc80029..9da5876fd4 100644 --- a/Xext/panoramiXh.h +++ b/Xext/panoramiXh.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */ /* * Server dispatcher function replacements diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 73a441a882..6c76a309f5 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -26,7 +26,7 @@ Equipment Corporation. /* Massively rewritten by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ #include #include "X.h" diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 27cbcda52f..1d187bc279 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */ #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index 15ed9401c4..4f23ca383a 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/Xext/saver.c b/Xext/saver.c index 6b9ee59971..377e1969c0 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/security.c b/Xext/security.c index bd52be407b..b467338235 100644 --- a/Xext/security.c +++ b/Xext/security.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/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */ #include "dixstruct.h" #include "extnsionst.h" diff --git a/Xext/shape.c b/Xext/shape.c index dfa7825ea2..0407db90ff 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/shm.c b/Xext/shm.c index 6ecfbe94cf..d2e1f507bb 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index afde19cba7..8915224314 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ diff --git a/Xext/sync.c b/Xext/sync.c index 25d360bfa8..62636a0c72 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index b31057a0d9..7c9348c0fe 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 1da665af03..dec2c181e7 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */ /* * BIGFONT extension for sharing font metrics between clients (if possible) * and for transmitting font metrics to clients in a compressed form. diff --git a/Xext/xprint.c b/Xext/xprint.c index e50fb4068c..96e2ca078b 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -64,7 +64,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ #define _XP_PRINT_SERVER_ #include "X.h" diff --git a/Xext/xres.c b/Xext/xres.c index 90d02a142b..4f0f9e2977 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.8 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ /* $XdotOrg$ */ #define NEED_EVENTS diff --git a/Xext/xtest.c b/Xext/xtest.c index 2e7eeec622..1f4213db21 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 41c78d9c91..96e680832c 100644 --- a/Xext/xtest1dd.c +++ b/Xext/xtest1dd.c @@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.6 2003/10/28 23:08:44 tsi Exp $ */ /*************************************************************** * include files diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h index 6e258080ef..60663dfb98 100644 --- a/Xext/xtest1dd.h +++ b/Xext/xtest1dd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index a3f28ed54a..516b7b3c07 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -53,7 +53,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.5 2003/09/13 21:33:03 dawes Exp $ */ /***************************************************************************** * include files diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index b377defb6a..a1dd69e199 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */ /* ** File: diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h index 342a874e8f..00af9858b3 100644 --- a/Xext/xvdisp.h +++ b/Xext/xvdisp.h @@ -1,3 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */ +/* $XFree86$ */ extern void XineramifyXv(void); diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 8dafa8b26e..d4bff69ad0 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ #ifndef XVDIX_H #define XVDIX_H diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 5e163827d5..abef11b99d 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */ /* ** File: diff --git a/Xext/xvmc.c b/Xext/xvmc.c index cb6c06301c..c892c9567f 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index b589c54875..6b39d1356c 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ #ifndef _XVMC_H #define _XVMC_H diff --git a/Xi/allowev.c b/Xi/allowev.c index 2eb463d41a..cca0caaeff 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/allowev.h b/Xi/allowev.h index 0202b2cf53..40c9a30c86 100644 --- a/Xi/allowev.h +++ b/Xi/allowev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index f5988d76b8..91761a39db 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h index 0d15001a0b..a7e1c3b241 100644 --- a/Xi/chgdctl.h +++ b/Xi/chgdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index 213fc7bf59..d00bf5392c 100644 --- a/Xi/chgfctl.c +++ b/Xi/chgfctl.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h index 4f833617ad..cadf27fb4a 100644 --- a/Xi/chgfctl.h +++ b/Xi/chgfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index b0b82ee6d3..1aef440450 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index 5a2cef2c74..a878f13937 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 2b638252fa..7d411f1810 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h index fd7ed4673c..1992852631 100644 --- a/Xi/chgkmap.h +++ b/Xi/chgkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgprop.c b/Xi/chgprop.c index 96ce0bebe0..7d1e141715 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/chgprop.h b/Xi/chgprop.h index 9df05b4d09..e9cb56a479 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgptr.c b/Xi/chgptr.c index c6ece1d65e..0fce984732 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.6 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/Xi/chgptr.h b/Xi/chgptr.h index 3168e97105..adf50b0bde 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/closedev.c b/Xi/closedev.c index 1f7e7dbd2c..71eb04332b 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.3 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/Xi/closedev.h b/Xi/closedev.h index 0295b2c8f6..882d81f145 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/devbell.c b/Xi/devbell.c index 98520ec1ce..6d3fcce534 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/devbell.h b/Xi/devbell.h index bbf6dea92a..8ceafa629b 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/exevents.c b/Xi/exevents.c index d2b2fb58ca..ec07f443a2 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.10 2001/12/14 19:58:55 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/exglobals.h b/Xi/exglobals.h index f07618b840..6f397a2d04 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.2 1996/05/06 05:56:03 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/extinit.c b/Xi/extinit.c index 01d51ba645..60fd885cac 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.6 2001/12/14 19:58:55 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getbmap.c b/Xi/getbmap.c index fb22a14229..febfa02936 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getbmap.h b/Xi/getbmap.h index 999a7c9f92..f1e300191b 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getdctl.c b/Xi/getdctl.c index 5b24bffbe4..e7a3a80507 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 0318b43879..5092bb4c68 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getfctl.c b/Xi/getfctl.c index 59c2c122b2..94f1bc4a11 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getfctl.h b/Xi/getfctl.h index 6ba96b066e..fe799244af 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getfocus.c b/Xi/getfocus.c index 2b916da118..e29b54ad6e 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getfocus.h b/Xi/getfocus.h index d3df5ba5f9..0ae1397145 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getkmap.c b/Xi/getkmap.c index 4a7a7e2965..cd9d00c43d 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getkmap.h b/Xi/getkmap.h index ebd02f3ef0..b0dfb9f8e3 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getmmap.c b/Xi/getmmap.c index 67e36b4427..5fe62fcce3 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getmmap.h b/Xi/getmmap.h index ff317e0c4d..deeb28fdd0 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getprop.c b/Xi/getprop.c index a3f3226ead..88655322f1 100644 --- a/Xi/getprop.c +++ b/Xi/getprop.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/Xi/getprop.h b/Xi/getprop.h index 452875bd90..b75dc515b7 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getselev.c b/Xi/getselev.c index 75b9137a66..61ee1091db 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.5 2001/10/28 03:32:53 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xi/getselev.h b/Xi/getselev.h index 5ed759c29e..0929de6fd8 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getvers.c b/Xi/getvers.c index c220b5a814..638548e609 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getvers.h b/Xi/getvers.h index 2304c66391..c93359f997 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdev.c b/Xi/grabdev.c index 80f948de5e..565d4d19da 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 1eddd24ac4..8a2e8fb398 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index cbc4fd8bde..e4a3dfd305 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index 8782c12ac6..c1a02de589 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index d7481801b9..6366884ba6 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index eb8db95111..cf25e861fa 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index 1ddcca3ae8..f22785fd46 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.6 2001/10/28 03:32:53 tsi Exp $ */ /*********************************************************************** * diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index 7d85e566e5..a4739db387 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/listdev.c b/Xi/listdev.c index ac4c875a1b..f95d60d25f 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.3 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/listdev.h b/Xi/listdev.h index c9553b6926..04518e528e 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/opendev.c b/Xi/opendev.c index 26210fa862..c2a07aaff7 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/opendev.h b/Xi/opendev.h index 818e2d877c..b5608792df 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/queryst.c b/Xi/queryst.c index 598ab85aeb..240c3a610d 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.4 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/queryst.h b/Xi/queryst.h index 50d36e95e4..051192228f 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/selectev.c b/Xi/selectev.c index a46a029285..11f206cc82 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/selectev.h b/Xi/selectev.h index 2327b94c52..e2fa176238 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/sendexev.c b/Xi/sendexev.c index ae6f8cdc62..aa91461760 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/sendexev.h b/Xi/sendexev.h index c2ace5804e..0f935addc2 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setbmap.c b/Xi/setbmap.c index 52553948d1..cc7c0fbb21 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setbmap.h b/Xi/setbmap.h index 77f097104a..36584767ea 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setdval.c b/Xi/setdval.c index fe2e138530..2704775ae6 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setdval.h b/Xi/setdval.h index e6f08a64c6..65ccb45041 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 5999345492..6e57ad2684 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setfocus.h b/Xi/setfocus.h index 1da6927b43..db2dc1b61a 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 4c4d19c8b0..7af5e1037c 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/setmmap.h b/Xi/setmmap.h index 30fb57b48e..fd27104887 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setmode.c b/Xi/setmode.c index 9c3feb4db6..2eff821e79 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setmode.h b/Xi/setmode.h index 63a1dd35bc..e05fb76339 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/stubs.c b/Xi/stubs.c index 879d8e9b7b..d1b9f285c4 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.4 2001/12/14 19:58:59 dawes Exp $ */ /* * stubs.c -- stub routines for the X server side of the XINPUT diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index a1ab911fe2..7a3c680bcc 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 9a036901f9..96d2662e12 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index 66ccc72af6..a03979dcf7 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 500b77ebbe..2f7899c31c 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index d7632db2a4..2bf25248c2 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index c43575ba1b..275ec446de 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c index 83d6b9674f..a3046c159c 100644 --- a/Xprint/AttrValid.c +++ b/Xprint/AttrValid.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.4 2001/01/17 22:36:27 dawes Exp $ */ #include diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 87ab48b691..8e431c285e 100644 --- a/Xprint/AttrValid.h +++ b/Xprint/AttrValid.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h index 3830c20d2d..d6364af26f 100644 --- a/Xprint/DiPrint.h +++ b/Xprint/DiPrint.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.3 1999/12/16 02:26:24 robin Exp $ */ /* * The XpDiListEntry struct is the type of each element of the array diff --git a/Xprint/Init.c b/Xprint/Init.c index c936f4542b..0deafda7c7 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -50,7 +50,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.14tsi Exp $ */ #include #include diff --git a/Xprint/Oid.c b/Xprint/Oid.c index 4c23a6e097..311d177d0e 100644 --- a/Xprint/Oid.c +++ b/Xprint/Oid.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.5tsi Exp $ */ #include "attributes.h" diff --git a/Xprint/Oid.h b/Xprint/Oid.h index c5574b06ee..e2a97869f6 100644 --- a/Xprint/Oid.h +++ b/Xprint/Oid.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.3 1999/12/16 02:26:24 robin Exp $ */ #ifndef _Xp_Oid_h #define _Xp_Oid_h diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h index 3aab300dc1..6489ae533f 100644 --- a/Xprint/OidStrs.h +++ b/Xprint/OidStrs.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ static int XpOidStringMapCount = 127; diff --git a/Xprint/Util.c b/Xprint/Util.c index 9e0bdf925a..1f4a14666a 100644 --- a/Xprint/Util.c +++ b/Xprint/Util.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in */ #if defined(linux) && defined(__STRICT_ANSI__) diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 327cb468ca..983e5c1c4f 100644 --- a/Xprint/ValTree.c +++ b/Xprint/ValTree.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "scrnintstr.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index 08d77a5517..5dfd90f8c8 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -45,7 +45,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */ #include #include diff --git a/Xprint/attributes.h b/Xprint/attributes.h index d9d551f32e..b43d76af50 100644 --- a/Xprint/attributes.h +++ b/Xprint/attributes.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.5 2001/08/01 00:44:45 tsi Exp $ */ #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 3d29fd1b14..4c0f20b0bb 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.13 2001/06/11 16:59:02 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index 7bb08b4127..b24f5c6c05 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index 2af1b2c414..f11cc7a6c0 100644 --- a/Xprint/pcl/Pcl.h +++ b/Xprint/pcl/Pcl.h @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PCL_H_ #define _PCL_H_ diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c index ca13b3a846..af32eb6199 100644 --- a/Xprint/pcl/PclArc.c +++ b/Xprint/pcl/PclArc.c @@ -45,7 +45,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ #include #include diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c index 971506da67..00e6aff047 100644 --- a/Xprint/pcl/PclArea.c +++ b/Xprint/pcl/PclArea.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c index c279c8024e..d5d2e022bc 100644 --- a/Xprint/pcl/PclColor.c +++ b/Xprint/pcl/PclColor.c @@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c index 7e463d4987..e7288c9eca 100644 --- a/Xprint/pcl/PclCursor.c +++ b/Xprint/pcl/PclCursor.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #include diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c index f2141f9ff4..d5eff48c7b 100644 --- a/Xprint/pcl/PclFonts.c +++ b/Xprint/pcl/PclFonts.c @@ -13,7 +13,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86$ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c index e1fe772bdf..67331a454e 100644 --- a/Xprint/pcl/PclGC.c +++ b/Xprint/pcl/PclGC.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ #include "gcstruct.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index 5ee49631e0..460c11eb66 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -76,7 +76,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c index 3c10f97ca8..aa72e8ff05 100644 --- a/Xprint/pcl/PclLine.c +++ b/Xprint/pcl/PclLine.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ #include "Pcl.h" #include "gcstruct.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 5b0939df2b..63caa0fe59 100644 --- a/Xprint/pcl/PclMisc.c +++ b/Xprint/pcl/PclMisc.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c index 238a159ab6..372a54e9f2 100644 --- a/Xprint/pcl/PclPixel.c +++ b/Xprint/pcl/PclPixel.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ #include diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c index ba91fc9ece..178289bc19 100644 --- a/Xprint/pcl/PclPixmap.c +++ b/Xprint/pcl/PclPixmap.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #include "Pcl.h" #include "cfb.h" diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c index a5de773999..ddfd9ef8aa 100644 --- a/Xprint/pcl/PclPolygon.c +++ b/Xprint/pcl/PclPolygon.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index aa2164c92f..70c788eac1 100644 --- a/Xprint/pcl/PclPrint.c +++ b/Xprint/pcl/PclPrint.c @@ -43,7 +43,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c index 3c7cf05af3..121ed00773 100644 --- a/Xprint/pcl/PclSFonts.c +++ b/Xprint/pcl/PclSFonts.c @@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.8 2003/12/22 17:48:05 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ #include diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c index 98c17dcf98..92261c9770 100644 --- a/Xprint/pcl/PclSpans.c +++ b/Xprint/pcl/PclSpans.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index 48b4684271..9ef4c505fb 100644 --- a/Xprint/pcl/PclText.c +++ b/Xprint/pcl/PclText.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ #ifdef DO_TWO_BYTE_PCL #include "iconv.h" diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c index 27d8ea97d7..42a6f62341 100644 --- a/Xprint/pcl/PclWindow.c +++ b/Xprint/pcl/PclWindow.c @@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ #include diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h index 1386b0ab4d..1a68faf1ec 100644 --- a/Xprint/pcl/Pclmap.h +++ b/Xprint/pcl/Pclmap.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ #ifndef _PCLMAP_H_ #define _PCLMAP_H_ diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 7b0aaeb391..d33f301fab 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.13 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c index a6a3754877..4a7865af6e 100644 --- a/Xprint/ps/PsAttVal.c +++ b/Xprint/ps/PsAttVal.c @@ -32,7 +32,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.4 2001/01/17 22:36:31 dawes Exp $ */ #include "Ps.h" #include "AttrValid.h" diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c index 13c4e19788..f276c180fc 100644 --- a/Xprint/ps/PsAttr.c +++ b/Xprint/ps/PsAttr.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c index 92082226f0..6417410ee9 100644 --- a/Xprint/ps/PsColor.c +++ b/Xprint/ps/PsColor.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.2 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c index 9792dae4df..1f87f7e762 100644 --- a/Xprint/ps/PsFonts.c +++ b/Xprint/ps/PsFonts.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.6 2001/12/19 21:55:59 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index 1c2877231d..ea441cff58 100644 --- a/Xprint/ps/PsGC.c +++ b/Xprint/ps/PsGC.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.6tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index 193fc05182..a7a63343d6 100644 --- a/Xprint/ps/PsInit.c +++ b/Xprint/ps/PsInit.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.13tsi Exp $ */ #include #include diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c index ff4c6da805..dd01fcb658 100644 --- a/Xprint/ps/PsLine.c +++ b/Xprint/ps/PsLine.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index 75f692d565..3085888c74 100644 --- a/Xprint/ps/PsMisc.c +++ b/Xprint/ps/PsMisc.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Xos.h" /* for SIGCLD on pre-POSIX systems */ #include diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c index 09a89fa2d1..303b0d5ec4 100644 --- a/Xprint/ps/PsPixel.c +++ b/Xprint/ps/PsPixel.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index 2e821aa1c7..a020aba22a 100644 --- a/Xprint/ps/PsPixmap.c +++ b/Xprint/ps/PsPixmap.c @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c index 0cd826f433..d334c77781 100644 --- a/Xprint/ps/PsPolygon.c +++ b/Xprint/ps/PsPolygon.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.6 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index 8a06205e5c..5e549836f3 100644 --- a/Xprint/ps/PsPrint.c +++ b/Xprint/ps/PsPrint.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.10 2001/12/14 19:59:17 dawes Exp $ */ #include #include diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c index 32ca58d205..a7370866ea 100644 --- a/Xprint/ps/PsSpans.c +++ b/Xprint/ps/PsSpans.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c index b04d910d5f..ae44b3f1c4 100644 --- a/Xprint/ps/PsText.c +++ b/Xprint/ps/PsText.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.12tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c index e39b602cb3..987d434ff3 100644 --- a/Xprint/ps/PsWindow.c +++ b/Xprint/ps/PsWindow.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.12tsi Exp $ */ #include #include diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index f1507d8491..6b4c71a2bc 100644 --- a/Xprint/ps/psout.c +++ b/Xprint/ps/psout.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.11 2001/12/19 21:55:59 dawes Exp $ */ /* * For XFree86 3.3.3: diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h index 2fe83ffc7d..37b089ece0 100644 --- a/Xprint/ps/psout.h +++ b/Xprint/ps/psout.h @@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.4 2001/12/14 19:59:18 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index d306dea21d..c8dfad1e3f 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index 0533cd5b20..750dc07224 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 7cce3f22ab..4527ba8dbc 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ #include #include "X.h" diff --git a/afb/afb.h b/afb/afb.h index 1f64017823..708fe7643e 100644 --- a/afb/afb.h +++ b/afb/afb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index 7f04a7de02..b07216899b 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbblt.c b/afb/afbblt.c index c0b48130e6..13a56e521d 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */ /* * afb copy area */ diff --git a/afb/afbbres.c b/afb/afbbres.c index 227f3bc1f6..732ea65faf 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 57309175e5..581ecb84fd 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index 725f93d48a..c3e844d57c 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbclip.c b/afb/afbclip.c index 07eb3b816a..0acf35b2aa 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbcmap.c b/afb/afbcmap.c index e565589723..cfa41aab3c 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */ /* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c index 1db48b07c7..e13c7948aa 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index 25ab5e56e8..b5e6802d2a 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index 69985aebcc..647641d7de 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfont.c b/afb/afbfont.c index 0ad8d9de38..5df6691c57 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */ +/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbgc.c b/afb/afbgc.c index fe88475a3a..4ce8939026 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 0fa825d210..26ed5ba60c 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index b50c357b44..7165afd519 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbimage.c b/afb/afbimage.c index cfb230e368..52553f55a3 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 60d212ca08..8f7509df5a 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbline.c b/afb/afbline.c index 796ddffeb5..221e2ddd7d 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index c0ae1c545a..4928a84d38 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index fe0d8bc79c..951ec99467 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index c0c2065f1f..3156b0617c 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c index 3938433c38..26d87868a4 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index 239346ceb6..c552b388aa 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index 17d9240598..bb84e676a0 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c index b09f3b0370..23dca74161 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index d556acd8c1..311becb8ab 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index d2b3fd02b8..d947825e20 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index 93331b8577..a4ea4d3ac5 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index b12eeb2526..a4acf326f0 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */ /* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtile.c b/afb/afbtile.c index 3b861b822a..b4376d18c5 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbwindow.c b/afb/afbwindow.c index 024fc04b66..b6037d8cb4 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */ /* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c index db1bd2bfd1..ae9136f706 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/cfb/cfb.h b/cfb/cfb.h index b7d0279056..e5900dc151 100644 --- a/cfb/cfb.h +++ b/cfb/cfb.h @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */ #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 1dd742c603..3309fb764d 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.4 2001/01/17 22:36:34 dawes Exp $ */ /* * cfb8bit.c diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h index 0c6b519254..2bfdace35a 100644 --- a/cfb/cfb8bit.h +++ b/cfb/cfb8bit.h @@ -7,7 +7,7 @@ * are used for depths other than 8. Perhaps the file should be * renamed. dpw */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.7 2001/12/14 19:59:20 dawes Exp $ */ /* diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 01c412b97e..6f8f896b80 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium * - * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.19 2003/10/29 22:44:52 tsi Exp $ + * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.18tsi Exp $ * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 6c2fa30f32..8b2468992a 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index 18f90f1fd2..b8ef233012 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -2,7 +2,7 @@ * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.19tsi Exp $ */ /* diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 5d2e084fd7..7f4e3e10f4 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -1,7 +1,7 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.13tsi Exp $ */ /* diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index 4522595818..b306ee80b0 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 7fe71fa2fa..4f6630ab38 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 5e7b914713..19de06ad96 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */ /*- * cfbbstore.c -- * Functions required by the backing-store implementation in MI. diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1830ffa5ed..1806916ff8 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ #include "X.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index ee4c18fdc6..a2a51a4521 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 64ec508c86..01e4557d46 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.6tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index c6a7270c2d..86258ed4fa 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -1,7 +1,7 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ /* diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 14a6a9d52e..6234694d6e 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index c2e7a59659..b4a9cc4841 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 737f302375..003be6dccc 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index 60a012c285..c0fb01c0e5 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.7 2003/07/16 01:38:37 dawes Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 6f4f7abe67..88b1e740f4 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index aa10602400..a40e995be0 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 1983ae48a0..68b5cc68d6 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 432cb62d98..28b0cb8c51 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 42056345a2..60fa94df20 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.11tsi Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index cbf3647702..5bc759d01d 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index b7f9969dd9..5d5764c092 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.13tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index bd2e1b6f17..3502e879c1 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index 0b14bc614d..fa38f0cf42 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index e564b4d6e1..37d5801b8b 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index d8b781397f..a5886b6ecf 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 0de172f03a..3f313b0e39 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -2,7 +2,7 @@ * Push Pixels for 8 bit displays. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.5 2001/01/17 22:36:36 dawes Exp $ */ /* diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index 7f6e93919b..ba8dd89f22 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -1,7 +1,7 @@ /* * Fill 32 bit stippled rectangles for 8 bit frame buffers */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 1ee6771e06..3014b3a5a2 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* cfb reduced rasterop computations */ diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index d8dce082c2..a43bf19784 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.11 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ #ifndef GXcopy #include "X.h" diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 7e0d15dd4f..ffdf55b814 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.19 2001/01/17 22:36:36 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 4f7dfaee1f..8385fe35ad 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index f0a3e361ea..f4e7f33855 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.9 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index 5c4f1c445f..c27f693129 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86$ */ #ifndef _CFBTAB_H_ #define _CFBTAB_H_ diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 0cdbddc7a4..9048ec3750 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -3,7 +3,7 @@ * 8 bit displays, in Copy mode with no clipping. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index 7450c7829f..ff7f3be57f 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index b202943e83..1ba4bb16d3 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -2,7 +2,7 @@ * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.6tsi Exp $ */ /* diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index e372fe87df..bd6a0b82c9 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -2,7 +2,7 @@ * Fill odd tiled rectangles and spans. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.6tsi Exp $ */ /* diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index cae13cf3c7..13148728c0 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index 3703a5105e..baa89f3189 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.4tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h index 9a2bac720a..01bb939e88 100644 --- a/cfb/stip68kgnu.h +++ b/cfb/stip68kgnu.h @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.4 2001/12/14 19:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.3 2001/01/17 22:36:37 dawes Exp $ */ /* * Stipple stack macro for 68k GCC diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s index 1857956051..a6a40491f7 100644 --- a/cfb/stipsparc.s +++ b/cfb/stipsparc.s @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s index f878fbf809..5703c0f1b0 100644 --- a/cfb/stipsprc32.s +++ b/cfb/stipsprc32.s @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb24/cfbrrop24.h b/cfb24/cfbrrop24.h index 0bb97ce5ba..9f15d1a826 100644 --- a/cfb24/cfbrrop24.h +++ b/cfb24/cfbrrop24.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.2 2003/10/29 22:46:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.1tsi Exp $ */ #define RROP_DECLARE \ unsigned long piQxelAnd[3], piQxelXor[3], spiQxelXor[8]; diff --git a/dbe/dbe.c b/dbe/dbe.c index 59087876a1..7f60888de3 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -31,7 +31,7 @@ * DIX DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.10 2001/08/23 14:19:24 alanh Exp $ */ /* INCLUDES */ diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 3634fe7d7b..f176c6fd17 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -30,7 +30,7 @@ * Header file for DIX-related DBE * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index e7617e7280..bdf46b8ae2 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -30,7 +30,7 @@ * Machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.4 2001/03/06 17:31:34 dawes Exp $ */ /* INCLUDES */ diff --git a/dbe/midbe.h b/dbe/midbe.h index 7b12376337..3f9bb0090e 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -30,7 +30,7 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86$ */ #ifndef MIDBE_H diff --git a/dix/atom.c b/dix/atom.c index 66c045583c..7509f0a247 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 19d08d98bd..2c0bf7c65f 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes 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 2ef9e5e246..fc81a51970 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 46af5eabcd..d4e4be8239 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 01f9e2694e..0d1a0b0503 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 XINERAMA_DEBUG #include diff --git a/dix/dispatch.h b/dix/dispatch.h index d144c6c70f..ba43bdca29 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 c8567cf741..c85712bb5d 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes 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 38cfd4e0db..40f80d3487 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 227d62934e..29c99fd689 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 36f053f028..3fcf31b8e6 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 11f215c8d9..ee787bca30 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 293c61bd5c..0682ed7c77 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 $ */ +/* $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 7a9fbcdb55..6eba43d1ff 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 c3e578ef1e..5d2889702d 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.4 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes 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 fda07801c3..2df5d73748 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 2d08858468..64d705e248 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 1af6156b50..f3d0edc9ec 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 2caee99fcf..7ca7ee037f 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 4944717302..6bde83b967 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 358ec81398..d795a3deaf 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 a76bc7535f..6037b12202 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 cd0007f666..6f2b9300d8 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 db6de103ca..dac3205fb5 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 diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index 4a24ac9a2e..a50cb4cd9f 100644 --- a/doc/Xserver.man.pre +++ b/doc/Xserver.man.pre @@ -22,7 +22,7 @@ .\" not be 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/programs/Xserver/Xserver.man,v 3.32 2004/01/12 21:43:19 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH XSERVER 1 __xorgversion__ diff --git a/doc/smartsched b/doc/smartsched index 3d5a84b9b6..057a759fd2 100644 --- a/doc/smartsched +++ b/doc/smartsched @@ -201,4 +201,4 @@ response and benchmark numbers at the same time. -$XFree86: xc/programs/Xserver/hw/xfree86/doc/smartsched,v 1.2 1999/11/19 14:59:16 hohndel Exp $ +$XFree86: $ diff --git a/fb/fb.h b/fb/fb.h index c9633d248f..fc8dc02292 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 1f9e843cf5..08d6817981 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.5 2001/05/29 04:54:08 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.4 2000/08/09 17:50:51 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fb24_32.h b/fb/fb24_32.h index d0a0acb97d..80034aa255 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $ + * $XFree86$ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 687de493ac..e7fcfd45b2 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbarc.c b/fb/fbarc.c index 9713ffb093..bba95a84eb 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.8 2002/11/09 04:59:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */ #include "fb.h" #include "mizerarc.h" diff --git a/fb/fbbits.c b/fb/fbbits.c index b1c123d21b..3cca2bbb26 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.6 2000/02/23 20:29:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbbits.h b/fb/fbbits.h index 80fbc40105..4f9d04e628 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbblt.c b/fb/fbblt.c index b1fd5f5b01..c6e29f387b 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbltone.c b/fb/fbbltone.c index e758794b88..7620225513 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.13 2002/02/23 00:42:07 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbstore.c b/fb/fbbstore.c index 07a6400a8c..7b08638566 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.2 2000/02/23 20:29:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbcmap.c b/fb/fbcmap.c index aeb53b1fba..001277a1d7 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -1,5 +1,5 @@ /* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 14960aa5fa..f650c972a5 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,6 +1,6 @@ /* * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $ - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 6dd48a786b..2f2d2f12b2 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.14 2003/12/28 17:22:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbfill.c b/fb/fbfill.c index 8ecb3cde68..d03bc64618 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */ #include "fb.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index d0468e0419..c39b500fd0 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index 29c3a36b02..dae05b0edd 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ #include "fb.h" diff --git a/fb/fbgc.c b/fb/fbgc.c index c3935a5b33..8cd08503d2 100644 --- a/fb/fbgc.c +++ b/fb/fbgc.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ /* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */ -/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index db35f6d5c0..3140377e5f 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.6 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 9f61b6bec5..b7eea5e770 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -1,6 +1,6 @@ /* * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $ - * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbimage.c b/fb/fbimage.c index 7d0284c384..49356f6272 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" #ifdef XFree86LOADER diff --git a/fb/fbline.c b/fb/fbline.c index 957222492f..d487801004 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 00521eef2b..28068db836 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.6tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fboverlay.h b/fb/fboverlay.h index 3dca8a3a4f..72891ece33 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.5 2002/09/19 13:22:00 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.c b/fb/fbpict.c index 894d5cd62a..533f08d01a 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.h b/fb/fbpict.h index fd911b0784..9ecc7a9094 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.11 2002/09/26 02:56:48 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 757406c211..e47999dbbc 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.11 2002/09/16 18:05:34 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 20426a9f1d..255cfa05cf 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbpush.c b/fb/fbpush.c index 4ae60764c6..ffb357ca3e 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbrop.h b/fb/fbrop.h index 9481be6800..0b97be66ff 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.4 2000/02/23 20:29:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index bdcc9d1397..2a46b00bea 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.11 2000/09/03 05:09:47 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbseg.c b/fb/fbseg.c index 284f11fa99..993672b2c8 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index e207760c6e..ea9f3b581c 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbsolid.c b/fb/fbsolid.c index 17b5bffe0c..a325da0c2b 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ + * $XFree86$ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 88f694bb84..46278c1acf 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.7 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbtile.c b/fb/fbtile.c index ed447f8d3e..27cd423724 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 3a44d53efa..8fcd2b5cc4 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.10 2002/09/27 00:31:24 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.9 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 University of Southern California * diff --git a/fb/fbutil.c b/fb/fbutil.c index 54b88ad7ea..436bff72ce 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.5 2001/03/28 14:37:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 25f2b41307..d19ac95abe 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man index a718e41cee..265dbeb632 100644 --- a/hw/darwin/XDarwin.man +++ b/hw/darwin/XDarwin.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.3 2001/09/23 23:02:37 torrey Exp $ .\" .TH XDARWIN 1 __vendorversion__ .SH NAME diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf index b8908998e0..56038582aa 100644 --- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf +++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww9000\viewh9000\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp index e7ca52c2c0..979f0bb067 100644 --- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp @@ -1 +1 @@ - #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.

Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)

In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.

Meerknopsmuis emulatie

Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt geïnstalleerd.

Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.

Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.
  • X11 scherm nummer: Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van één groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.

Schermvullend

  • Toetscombinatie knop: Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.

Licentie

The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.

X Window System is a trademark of X Consortium, Inc.

\ No newline at end of file + #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.

Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)

In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.

Meerknopsmuis emulatie

Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt geïnstalleerd.

Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.

Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.
  • X11 scherm nummer: Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van één groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.

Schermvullend

  • Toetscombinatie knop: Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.

Licentie

The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.

X Window System is a trademark of X Consortium, Inc.

\ No newline at end of file diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf index 5043b47f05..2bf7a8eafb 100644 --- a/hw/darwin/bundle/English.lproj/Credits.rtf +++ b/hw/darwin/bundle/English.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp index 99211244e1..4a8467ce19 100644 --- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp +++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp @@ -1,5 +1,5 @@ /* English versions of the Info.plist keys; used by most localizations. */ /* Most of these are set in the target application settings. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */ NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__; diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings index 241d1585b4..2c25c1dc31 100644 --- a/hw/darwin/bundle/English.lproj/Localizable.strings +++ b/hw/darwin/bundle/English.lproj/Localizable.strings @@ -1,5 +1,5 @@ /* English localized versions of strings used by the Mac OS X front end. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.3 2002/01/30 06:50:46 torrey Exp $ */ /* Title of alert panel */ "Quit X server?" = "Quit X server?"; diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp index fc11e26d38..5f18216aa8 100644 --- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf index 22f048b316..82f12ac44e 100644 --- a/hw/darwin/bundle/French.lproj/Credits.rtf +++ b/hw/darwin/bundle/French.lproj/Credits.rtf @@ -1,163 +1,156 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh4480\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 \ +\f1\b \cf0 \ Participants \'88 XonX pour XFree86 4.2 : -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Version pour Darwin x86 -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Traduction en espagnol -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Traduction en allemand -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Traduction en cor\'8een -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Claviers non-US -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Direction du projet -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Traduction en allemand -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Traduction en su\'8edois -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Version \'c7 rootless \'c8 -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Traduction en japonais -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i Traduction en fran\'8dais -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Remerciements : -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman et Zero G Software, Inc.\ \f2\i Installeur -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Participants \'88 XonX pour XFree86 4.2 : -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Version pour Darwin x86 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Direction du projet -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Version Cocoa de l'interface de XDarwin -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Impl\'8ementation initiale sur Quartz -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Librairies partag\'8ees dynamiquement -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Traduction en japonais -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Remerciements : -\f1\b0 \ +\f1\b \cf0 Remerciements : +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ Ic\'99ne \f2\i XDarwin -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Historique : -\f1\b0 \ +\f1\b \cf0 Historique : +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Premi\'8fre adaptation de XFree86 sur Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i Adaptation de Free86 4.0 pour Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Int\'8egration dans le projet XFree86 pour la version 4.0.2} +\f2\i Int\'8egration dans le projet XFree86 pour la version 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp index 0fdfb01fb9..4b23c46cd8 100644 --- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf index 5043b47f05..2bf7a8eafb 100644 --- a/hw/darwin/bundle/German.lproj/Credits.rtf +++ b/hw/darwin/bundle/German.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp index 6b1b91f5c1..f7b6e96aec 100644 --- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf index 0288c29a21..8278a40638 100644 --- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf +++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf @@ -1,178 +1,175 @@ -{\rtf1\mac\ansicpg10001\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\rtf1\mac\ansicpg10000\cocoartf102 +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; \f3\fnil\fcharset78 HiraKakuPro-W3;} {\colortbl;\red255\green255\blue255;} \vieww13980\viewh11160\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper \f2\i \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f3\i0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3 -\f1 \ +\f3\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3 +\f0 \ Torrey T. Lyons\ \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Michael Oland\ \f3 \'90\'56\'82\'b5\'82\'a2 -\f1 XDarwin +\f0 XDarwin \f3 \'83\'41\'83\'43\'83\'52\'83\'93 -\f1 \ +\f0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ Darwin x86 \f2\i \f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Pablo Di Noto\ \f2\i \f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Paul Edens\ \f2\i \f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Kyunghwan Kim\ \f2\i \f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Mario Klebsch\ \f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Torrey T. Lyons\ \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b -\f1 \ +\f0 \ Andreas Monitzer\ \f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Patrik Montgomery\ \f2\i \f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ Greg Parker\ \f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ - -\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 -\f1 \ - -\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ -Olivier Verdier\ - -\f2\i -\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 +\f0 \ + +\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 +\f0 \ +Olivier Verdier\ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f2\i \cf0 +\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 +\f0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i \f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89 -\f1 \ +\f0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ Darwin x86 \f3 \'83\'54\'83\'7c\'81\'5b\'83\'67 -\f1 \ +\f0 \ Torrey T. Lyons\ \f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b -\f1 \ +\f0 \ Andreas Monitzer\ Cocoa \f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68 -\f1 \ +\f0 \ Greg Parker\ \f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67 -\f1 \ +\f0 \ Christoph Pfisterer\ \f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a -\f1 \ +\f0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f3 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 -\f1 \ +\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5 +\f0 \ \f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59 -\f1 \ +\f0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ XDarwin \f3 \'83\'41\'83\'43\'83\'52\'83\'93 -\f1 \ +\f0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41 -\f1 \ +\f0 \ Dave Zarzycki\ XFree86 4.0 \f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41 -\f1 \ +\f0 \ Torrey T. Lyons\ XFree86 4.0.2 -\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87} +\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87} \ No newline at end of file diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp index 2065d43d4b..3e06770567 100644 --- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf index 60ad438d3f..5cbac7433c 100644 --- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf +++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf @@ -1,170 +1,161 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5140\viewh4980\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Contribuidores do XonX ao XFree86 4.3: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200 +\f0\b0 \ +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro -\f0\b \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 +\f1\b \ + \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f1\i0 \cf0 Michael Oland\ +\f0\i0 Michael Oland\ \f2\i New XDarwin icon -\f0\i0\b \ +\f1\i0\b \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Contribuidores do XonX ao XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Suporte para o Darwin x86\ -\f1\i0 Pablo Di Noto\ +\f0\i0 Pablo Di Noto\ \f2\i Localiza\'8d\'8bo para o Espanhol -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Localiza\'8d\'8bo para o Holand\'90s -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Localiza\'8d\'8bo para o Coreano -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Suporte para teclados Non-US -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i L\'92der de Projeto -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Localiza\'8d\'8bo para o Alem\'8bo -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Localiza\'8d\'8bo para o Sueco -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Suporte ao modo Compartilhado (Rootless) -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Localiza\'8d\'8bo para o Japon\'90s -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i Localiza\'8d\'8bo para o Fran\'8d\'90s -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Agradecimentos Especiais: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Instalador -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Membros do Time XonX\ Contribuindo com o XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Suporte ao Darwin x86\ -\f1\i0 Torrey T. Lyons\ +\f0\i0 Torrey T. Lyons\ \f2\i L\'92der de Projeto -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Vers\'8bo Cocoa da interface XDarwin -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Implementa\'8d\'8bo Original -\f1\i0 +\f0\i0 \f2\i ao Quartz \ -\f1\i0 Christoph Pfisterer\ +\f0\i0 Christoph Pfisterer\ \f2\i Bibliotecas Din\'89micas Compartilhadas -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Localiza\'8d\'8bo para o Japon\'90s -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Agradecimento Especial: -\f1\b0 \ +\f1\b \cf0 Agradecimento Especial: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i \'eacone do XDarwin -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Hist\'97rico: -\f1\b0 \ +\f1\b \cf0 Hist\'97rico: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Suporte Original do XFree86 no Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i Suporte ao -\f1\i0 +\f0\i0 \f2\i XFree86 4.0 no Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integra\'8d\'8bo dentro do Projeto XFree86 na vers\'8bo 4.0.2} +\f2\i Integra\'8d\'8bo dentro do Projeto XFree86 na vers\'8bo 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp index 37502eac6e..573f84c503 100644 --- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf index 5043b47f05..2bf7a8eafb 100644 --- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf +++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp index 3e0710a2c2..315f647c98 100644 --- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf index 5043b47f05..2bf7a8eafb 100644 --- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf +++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp index ee099d1a08..c0cdf9f753 100644 --- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf index 5043b47f05..2bf7a8eafb 100644 --- a/hw/darwin/bundle/ko.lproj/Credits.rtf +++ b/hw/darwin/bundle/ko.lproj/Credits.rtf @@ -1,165 +1,158 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique; +{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique; } {\colortbl;\red255\green255\blue255;} \vieww5160\viewh6300\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\ +\ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b\fs24 \cf0 Contributors to X.Org Foundation Release: -\f1\b0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\cf0 Kaleb KEITHLEY\ - -\f2\i Working Left and Right Meta (Command), Alt, Control, and Shift keys -\f1\i0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural - -\f0\b \cf0 \ -\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\cf0 Contributors to XFree86 4.4: -\f1\b0 \ +\f1\b \cf0 Contributors to XFree86 4.4: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Harper\ \f2\i Rootless acceleration and Apple-WM extension -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Additional XonX Contributors to XFree86 4.3: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Fabr\'92cio Luis de Castro\ \f2\i Portuguese localization -\f1\i0 \ +\f0\i0 \ Michael Oland\ \f2\i New XDarwin icon -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Contributors to XFree86 4.2: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Pablo Di Noto\ \f2\i Spanish localization -\f1\i0 \ +\f0\i0 \ Paul Edens\ \f2\i Dutch localization -\f1\i0 \ +\f0\i0 \ Kyunghwan Kim\ \f2\i Korean localization -\f1\i0 \ +\f0\i0 \ Mario Klebsch\ \f2\i Non-US keyboard support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i German localization -\f1\i0 \ +\f0\i0 \ Patrik Montgomery\ \f2\i Swedish localization -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Rootless support -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ Olivier Verdier\ \f2\i French localization -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 Special Thanks: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Devin Poolman and Zero G Software, Inc.\ \f2\i Installer -\f1\i0 \ +\f0\i0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural -\f0\b \cf0 \ +\f1\b \cf0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc \cf0 XonX Team Members\ Contributing to XFree86 4.1: -\f1\b0 \ +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Rob Braun\ \f2\i Darwin x86 support -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ \f2\i Project Lead -\f1\i0 \ +\f0\i0 \ Andreas Monitzer\ \f2\i Cocoa version of XDarwin front end -\f1\i0 \ +\f0\i0 \ Greg Parker\ \f2\i Original Quartz implementation -\f1\i0 \ +\f0\i0 \ Christoph Pfisterer\ \f2\i Dynamic shared libraries -\f1\i0 \ +\f0\i0 \ Toshimitsu Tanaka\ \f2\i Japanese localization -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 Special Thanks: -\f1\b0 \ +\f1\b \cf0 Special Thanks: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 Tiago Ribeiro\ \f2\i XDarwin icon -\f1\i0 \ +\f0\i0 \ \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc -\f0\b \cf0 History: -\f1\b0 \ +\f1\b \cf0 History: +\f0\b0 \ \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural \cf0 John Carmack\ \f2\i Original XFree86 port to Mac OS X Server -\f1\i0 \ +\f0\i0 \ Dave Zarzycki\ \f2\i XFree86 4.0 port to Darwin 1.0 -\f1\i0 \ +\f0\i0 \ Torrey T. Lyons\ -\f2\i Integration into XFree86 Project for 4.0.2} +\f2\i Integration into XFree86 Project for 4.0.2} \ No newline at end of file diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp index 4c83fe2782..fc11e26d38 100644 --- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp index b27ad46fed..51cdb5c9e5 100644 --- a/hw/darwin/bundle/startXClients.cpp +++ b/hw/darwin/bundle/startXClients.cpp @@ -3,7 +3,7 @@ XCOMM!/bin/sh XCOMM This script is used by XDarwin to start X clients when XDarwin is XCOMM launched from the Finder. XCOMM -XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $ +XCOMM $XFree86: $ userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index b2bd9e041f..cbf58a2d8a 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -30,7 +30,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include "X.h" #include "Xproto.h" @@ -408,11 +408,9 @@ static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff ) } /* -=========================================================================== Utility routines -=========================================================================== */ /* @@ -500,11 +498,9 @@ static int DarwinParseModifierList( } /* -=========================================================================== Functions needed to link against device independent X -=========================================================================== */ /* diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 79fa00ffc8..e49c450efa 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -23,7 +23,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.19 2003/10/16 23:50:08 torrey Exp $ */ #ifndef _DARWIN_H #define _DARWIN_H diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h index 68a7ad16f7..06e7b71c51 100644 --- a/hw/darwin/darwinClut8.h +++ b/hw/darwin/darwinClut8.h @@ -1,7 +1,7 @@ /* * Darwin default 8-bit Colormap for StaticColor */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */ #ifndef _DARWIN_CLUT8_ #define _DARWIN_CLUT8_ diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index 34cd94195a..c9f7a925fd 100644 --- a/hw/darwin/darwinEvents.c +++ b/hw/darwin/darwinEvents.c @@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c index 1f9312bbdf..904c4068f4 100644 --- a/hw/darwin/darwinKeyboard.c +++ b/hw/darwin/darwinKeyboard.c @@ -38,7 +38,7 @@ // //============================================================================= -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ /* =========================================================================== diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h index c718889902..405dcf9d17 100644 --- a/hw/darwin/darwinKeyboard.h +++ b/hw/darwin/darwinKeyboard.h @@ -23,7 +23,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ #ifndef DARWIN_KEYBOARD_H #define DARWIN_KEYBOARD_H 1 diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index eae6f7a498..0c8104e676 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -34,7 +34,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 413dfd7e87..1e03cdf800 100644 --- a/hw/darwin/iokit/xfIOKit.h +++ b/hw/darwin/iokit/xfIOKit.h @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */ #ifndef _XFIOKIT_H #define _XFIOKIT_H diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index f3c80145fc..69eb41d2f2 100644 --- a/hw/darwin/iokit/xfIOKitCursor.c +++ b/hw/darwin/iokit/xfIOKitCursor.c @@ -57,7 +57,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */ #include "scrnintstr.h" #include "cursorstr.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 9d25c69fea..80508775ee 100644 --- a/hw/darwin/iokit/xfIOKitStartup.c +++ b/hw/darwin/iokit/xfIOKitStartup.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h index 22a2f1441a..feecf24d65 100644 --- a/hw/darwin/quartz/Preferences.h +++ b/hw/darwin/quartz/Preferences.h @@ -25,7 +25,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m index 4120b6360c..cca2f695df 100644 --- a/hw/darwin/quartz/Preferences.m +++ b/hw/darwin/quartz/Preferences.m @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.3 2003/05/14 05:27:56 torrey Exp $ */ #import "quartzCommon.h" diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h index 3d3e96dab8..a2622e060c 100644 --- a/hw/darwin/quartz/XApplication.h +++ b/hw/darwin/quartz/XApplication.h @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ +/* $XFree86: $ */ #import diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m index 9b81bbee04..e0ee8d9c6c 100644 --- a/hw/darwin/quartz/XApplication.m +++ b/hw/darwin/quartz/XApplication.m @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ +/* $XFree86: $ */ #import "XApplication.h" diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c index 7b2c89f38b..0adb4c2121 100644 --- a/hw/darwin/quartz/XDarwinStartup.c +++ b/hw/darwin/quartz/XDarwinStartup.c @@ -38,7 +38,7 @@ * dealings in this Software without prior written authorization from * Torrey T. Lyons. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man index 312f4b88b6..28efd1edfd 100644 --- a/hw/darwin/quartz/XDarwinStartup.man +++ b/hw/darwin/quartz/XDarwinStartup.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $ .TH XDarwinStartup 1 .SH NAME XDarwinStartup - Startup program for the XDarwin X window server diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index 1be07c0ee1..695086bfe0 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -30,7 +30,7 @@ * authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL #include "Xproto.h" diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m index 788441e7a1..3fad95c97d 100644 --- a/hw/darwin/quartz/XServer.m +++ b/hw/darwin/quartz/XServer.m @@ -35,7 +35,7 @@ * authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index d3e302727f..9b62915c8d 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h index 650173941c..63e2bea9f9 100644 --- a/hw/darwin/quartz/applewmExt.h +++ b/hw/darwin/quartz/applewmExt.h @@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */ #ifndef _APPLEWMEXT_H_ #define _APPLEWMEXT_H_ diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h index 666061dc12..01f5b04b4c 100644 --- a/hw/darwin/quartz/cr/XView.h +++ b/hw/darwin/quartz/cr/XView.h @@ -25,7 +25,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m index 2bf689ede3..5feac6b42e 100644 --- a/hw/darwin/quartz/cr/XView.m +++ b/hw/darwin/quartz/cr/XView.m @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ #import "XView.h" diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h index 74752f7684..94133e4afd 100644 --- a/hw/darwin/quartz/cr/cr.h +++ b/hw/darwin/quartz/cr/cr.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */ +/* $XFree86$ */ #ifndef _CR_H #define _CR_H diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m index 66e832b66b..a2e97ff814 100644 --- a/hw/darwin/quartz/cr/crAppleWM.m +++ b/hw/darwin/quartz/cr/crAppleWM.m @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m index 8845d0ddf6..210408cbe1 100644 --- a/hw/darwin/quartz/cr/crFrame.m +++ b/hw/darwin/quartz/cr/crFrame.m @@ -28,7 +28,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m index 1376564891..89b8abc2f0 100644 --- a/hw/darwin/quartz/cr/crScreen.m +++ b/hw/darwin/quartz/cr/crScreen.m @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 057c7cbaa3..d0702a082a 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -26,7 +26,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "darwin.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 72ad5ed8e4..8abce2318f 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.c +++ b/hw/darwin/quartz/fullscreen/quartzCursor.c @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h index d822c3e868..efcc4435e0 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.h +++ b/hw/darwin/quartz/fullscreen/quartzCursor.h @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c index 4208309655..98b8b6fee0 100644 --- a/hw/darwin/quartz/keysym2ucs.c +++ b/hw/darwin/quartz/keysym2ucs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ +/* $XFree86: $ * * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h index 1d91834487..c7ff6f3b32 100644 --- a/hw/darwin/quartz/keysym2ucs.h +++ b/hw/darwin/quartz/keysym2ucs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ +/* $XFree86: $ * * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 01ff0b0c1d..d295b4e61b 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -30,7 +30,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.13 2003/11/12 20:21:51 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index b8ae1d1e50..18f88d1f8d 100644 --- a/hw/darwin/quartz/quartz.h +++ b/hw/darwin/quartz/quartz.h @@ -31,7 +31,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZ_H #define _QUARTZ_H diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index a3e6af127f..64a4f33cc7 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -35,7 +35,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h index 1d213e36ad..e20c21ad24 100644 --- a/hw/darwin/quartz/quartzAudio.h +++ b/hw/darwin/quartz/quartzAudio.h @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */ #ifndef _QUARTZAUDIO_H #define _QUARTZAUDIO_H diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m index 9776c0b054..7ba0fbd512 100644 --- a/hw/darwin/quartz/quartzCocoa.m +++ b/hw/darwin/quartz/quartzCocoa.m @@ -34,7 +34,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.3 2003/01/19 06:52:54 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 9c61adda3d..2a5040252c 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -32,7 +32,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.13 2003/10/16 23:50:10 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 8abce2318f..711ce64f00 100644 --- a/hw/darwin/quartz/quartzCursor.c +++ b/hw/darwin/quartz/quartzCursor.c @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h index 9710d4be25..4db5531fab 100644 --- a/hw/darwin/quartz/quartzCursor.h +++ b/hw/darwin/quartz/quartzCursor.h @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index a9813135ef..d6a79b578d 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -32,7 +32,7 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index 658832aa18..e9f9d66980 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */ #include "quartzPasteboard.h" diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h index fef375493c..296c52c170 100644 --- a/hw/darwin/quartz/quartzPasteboard.h +++ b/hw/darwin/quartz/quartzPasteboard.h @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */ #ifndef _QUARTZPASTEBOARD_H #define _QUARTZPASTEBOARD_H diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c index bb7c7d2142..5a11d53217 100644 --- a/hw/darwin/quartz/quartzStartup.c +++ b/hw/darwin/quartz/quartzStartup.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index 8985f7b110..e2e97b4c8d 100644 --- a/hw/darwin/quartz/xpr/Xplugin.h +++ b/hw/darwin/quartz/xpr/Xplugin.h @@ -30,7 +30,7 @@ Note that these interfaces are provided solely for the use of the X11 server. Any other uses are unsupported and strongly discouraged. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */ #ifndef XPLUGIN_H #define XPLUGIN_H 1 diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index 3062d964a8..0eba61cb2e 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index aa595af85c..17f9e91a02 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h index 350f61b566..5d0b1fec85 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h index 1a2949b189..ae1b99db53 100644 --- a/hw/darwin/quartz/xpr/dristruct.h +++ b/hw/darwin/quartz/xpr/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index ad36204c53..632ffdb338 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-hash.h" #include "x-list.h" diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h index 2abb08cd73..97d4cc40c3 100644 --- a/hw/darwin/quartz/xpr/x-hash.h +++ b/hw/darwin/quartz/xpr/x-hash.h @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_HASH_H #define X_HASH_H 1 diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c index 3414e1543e..dcd34fdc54 100644 --- a/hw/darwin/quartz/xpr/x-hook.c +++ b/hw/darwin/quartz/xpr/x-hook.c @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: $ */ #include "x-hook.h" #include diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h index 14e8ca1f58..0b5e038fe5 100644 --- a/hw/darwin/quartz/xpr/x-hook.h +++ b/hw/darwin/quartz/xpr/x-hook.h @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: $ */ #ifndef X_HOOK_H #define X_HOOK_H 1 diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index 859a5163d5..17843362a6 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-list.h" #include diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index a65cfcb7c3..991e2b1f66 100644 --- a/hw/darwin/quartz/xpr/x-list.h +++ b/hw/darwin/quartz/xpr/x-list.h @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_LIST_H #define X_LIST_H 1 diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h index d4b0024e73..d82aef62b1 100644 --- a/hw/darwin/quartz/xpr/xpr.h +++ b/hw/darwin/quartz/xpr/xpr.h @@ -27,7 +27,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #ifndef XPR_H #define XPR_H diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index eca0de3342..a5186d5f62 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "xpr.h" #include "applewmExt.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index a3dea69e26..ee06043df7 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/darwin/quartz/xpr/xprCursor.c @@ -30,7 +30,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "quartzCommon.h" #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 10ba01768f..15a52a52c1 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -28,7 +28,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" #include "rootlessCommon.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index deef514ed5..a1a49c06e1 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.8 2003/11/12 20:21:52 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt index 94d61b1f04..fb6d4399ef 100644 --- a/hw/darwin/utils/README.txt +++ b/hw/darwin/utils/README.txt @@ -108,4 +108,4 @@ of the NeXT .keymapping file. -$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.1 2000/12/01 19:47:39 dawes Exp $ diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c index a264cbc10d..8f3340b155 100644 --- a/hw/darwin/utils/dumpkeymap.c +++ b/hw/darwin/utils/dumpkeymap.c @@ -1,4 +1,4 @@ -// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $ +// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $ //============================================================================= // // Copyright (C) 1999,2000 by Eric Sunshine diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man index 2ad6d54d21..12983badaf 100644 --- a/hw/darwin/utils/dumpkeymap.man +++ b/hw/darwin/utils/dumpkeymap.man @@ -30,7 +30,7 @@ // //============================================================================= // -// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $ +// $XFree86$ // .. .ig diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 345526d190..fdece85d76 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.10 2003/11/16 03:16:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ #include "X11/X.h" #define NEED_EVENTS diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 25f4262329..59283bdf35 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.26 2003/11/16 03:16:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ #if defined(WIN32) #include diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/Xvfb.man.pre index 102a0e4c3e..51bffe320e 100644 --- a/hw/vfb/Xvfb.man.pre +++ b/hw/vfb/Xvfb.man.pre @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.10 2003/11/23 05:40:36 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.9 2001/12/14 19:59:45 dawes Exp $ .\" .TH XVFB 1 __xorgversion__ .SH NAME diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes index f7dc012164..1d72861e41 100644 --- a/hw/xfree86/common/extramodes +++ b/hw/xfree86/common/extramodes @@ -1,7 +1,7 @@ // // Extra modes to include as default modes in the X server. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ // # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl index e31fe28e17..abe995550c 100644 --- a/hw/xfree86/common/modeline2c.pl +++ b/hw/xfree86/common/modeline2c.pl @@ -34,7 +34,7 @@ # the sale, use or other dealings in this Software without prior written # authorization from the copyright holder(s) and author(s). # -# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $ #my %flagshash; $flagshash{""} = "0"; diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes index d2df5931a1..851643fa64 100644 --- a/hw/xfree86/common/vesamodes +++ b/hw/xfree86/common/vesamodes @@ -3,7 +3,7 @@ // "VESA and Industry Standards and Guide for Computer Display Monitor // Timing", version 1.0, revision 0.8, adopted September 17, 1998. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $ # 640x350 @ 85Hz (VESA) hsync: 37.9kHz diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index d214163d58..61092a750e 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 3dde4ba7d0..8b41cfd241 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 21552d4859..4f9655b358 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 7257b204b7..1d6d332ec7 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */ +/* $XFree86$ */ /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at * modeline2c.pl */ diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index fbbafd8af0..3b7551fc58 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index d98f36f1c8..31ad165196 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,6 +1,6 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 87042cb14b..801f2bafe1 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ #include #include diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 0816c63a16..81c1b84ac6 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 90289057ba..db19e14424 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -1979,10 +1979,10 @@ xf86XVCopyYUV12ToPacked( Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24); #else /* This assumes a little-endian framebuffer */ - Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0]; - Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | Y[1]; - Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | Y[2]; - Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | Y[3]; + Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0]; + Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1]; + Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2]; + Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3]; #endif Dst += 4; Y += 8; V += 4; U += 4; i -= 4; @@ -1993,7 +1993,7 @@ xf86XVCopyYUV12ToPacked( Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24); #else /* This assumes a little-endian framebuffer */ - Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | Y[0]; + Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0]; #endif Dst++; Y += 2; V++; U++; } diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index facc278429..33fedeb0ff 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */ /* X Input Serial Buffer routines for use in any XInput driver that accesses diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 7b5e26a23a..39ae2ee110 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */ +/* $XFree86$ */ #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/ddc/DDC.HOWTO b/hw/xfree86/ddc/DDC.HOWTO index 2f2c95b7f6..833a7ab545 100644 --- a/hw/xfree86/ddc/DDC.HOWTO +++ b/hw/xfree86/ddc/DDC.HOWTO @@ -94,4 +94,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 666dfc6328..9b68b81bbb 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -3,7 +3,7 @@ * * Copyright 1999 by Andrew C Aitchison */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index a61940cfa5..58616d308b 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */ /* edid.c: retrieve EDID record from raw DDC1 data stream: data * is contained in an array of unsigned int each unsigned int diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 7a2f30cb49..ccf9d9280c 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */ /* edid.h: defines to parse an EDID block * diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index c0092aed90..bf2509c95f 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */ /* interpret_edid.c: interpret a primary EDID block * diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index acd931e709..ac479d3260 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ #include "Xarch.h" #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 0645338000..29f4183984 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */ /* print_edid.c: print out all information retrieved from display device * diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index fbb540e1d9..caea5caa19 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ #include "vdif.h" #include "misc.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 8d358613e4..7a647031ad 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 496f3573f1..123bb492e9 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */ /* xf86DDC.c * diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index b4252ef6b6..ae2e26641b 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */ /* xf86DDC.h * diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c index 9369db1f22..422da4820f 100644 --- a/hw/xfree86/dixmods/GLcoremodule.c +++ b/hw/xfree86/dixmods/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index f9dcc8477c..914678b71f 100644 --- a/hw/xfree86/dixmods/dbemodule.c +++ b/hw/xfree86/dixmods/dbemodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index a0108053c7..229efa446b 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.22 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index dc76cbf21b..a27fa5994b 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.17 2003/07/16 01:38:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.16 2002/03/06 21:12:33 mvojkovi Exp $ */ /* * diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 405f67b726..6fa07c7e60 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ #ifndef INITARGS #define INITARGS void diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 57a7872f02..99bac9daca 100644 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.5 2001/05/06 00:51:19 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.4 1999/12/13 01:39:40 robin Exp $ */ /* Prototypes for DGA functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index 973f54e235..4565f58603 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.22 2003/07/16 01:38:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 2556743bbe..5ad75258ec 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.18 2003/07/16 01:38:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */ #define NEED_REPLIES diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h index 831108399f..a823e28f28 100644 --- a/hw/xfree86/dixmods/extmod/xf86dgaext.h +++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dgaext.h,v 1.1 2003/07/16 01:38:30 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XF86DGAEXT_H_ #define _XF86DGAEXT_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 208260947c..3dab4277a4 100644 --- a/hw/xfree86/dixmods/extmod/xf86miscproc.h +++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.6 2003/04/03 16:15:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.5 2002/11/20 04:04:58 dawes Exp $ */ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index ce4903dd6e..737eb4b421 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.59 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.58 2003/11/06 18:37:57 tsi Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 4a9c461f62..0395ba877e 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index 2dcbd472a0..e08aef7f9e 100644 --- a/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.3 2001/04/08 16:33:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ #include "xvmcext.h" diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index f449d55ecf..eb8e54f263 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.12 2003/09/28 20:15:40 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.11 2001/06/15 21:22:38 dawes Exp $ */ /* * Authors: diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index 60b6bcfa08..274e68b2e0 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index acafc456d9..bd10221930 100644 --- a/hw/xfree86/dixmods/recordmod.c +++ b/hw/xfree86/dixmods/recordmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index 44aef65ce3..d24f8a823d 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index 07283cdb73..65062108ec 100644 --- a/hw/xfree86/dixmods/xf86XTrapModule.c +++ b/hw/xfree86/dixmods/xf86XTrapModule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86$ */ /* This is the xf86 module code for the DEC_XTRAP extension. */ diff --git a/hw/xfree86/doc/README.DRI b/hw/xfree86/doc/README.DRI index e663f2928e..e3daac059b 100644 --- a/hw/xfree86/doc/README.DRI +++ b/hw/xfree86/doc/README.DRI @@ -1254,4 +1254,4 @@ demo programs is available from http://dri.sourceforge.net/res.phtml Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/README.fonts b/hw/xfree86/doc/README.fonts index 2fe8dfaacc..ea9628a4b2 100644 --- a/hw/xfree86/doc/README.fonts +++ b/hw/xfree86/doc/README.fonts @@ -1184,4 +1184,4 @@ for example RFC 373. Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.28 2003/12/20 19:47:28 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/README.rapidaccess b/hw/xfree86/doc/README.rapidaccess index a78dfb9bce..d19eb81c62 100644 --- a/hw/xfree86/doc/README.rapidaccess +++ b/hw/xfree86/doc/README.rapidaccess @@ -45,4 +45,4 @@ Dennis Bj -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $ +$XFree86$ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG index 1a89203212..8c19544526 100644 --- a/hw/xfree86/doc/changelogs/CHANGELOG +++ b/hw/xfree86/doc/changelogs/CHANGELOG @@ -1,4 +1,41 @@ -XFree86 4.3.99.904 (xx February 2004) +XFree86 4.4.0 (29 February 2004) + 821. Fix Radeon secondary head register initialization (Hui Yu@ATI, + Benjamin Herrenschmidt). + 820. ati & atimisc module changes (Marc La France) + - Allow builds with ATIAvoidNonPCI && !ATIAvoidCPIO; + - Make handling of unknown Radeon's saner; + - Add private option to re-enable BIOS display switches; + - Deal with ati & atimisc module version skews; + - Fix private option handling; + 819. Fix rendition driver system lockup on changes to text mode + (Bugzilla #1204, Eric Wittry). + 818. Make the "fp=n" TTCap option behave the same with the FreeType backend + as with the X-TT backend (Bugzilla #1163, Chisato Yamauchi). + 817. Fix the disappearance of the RAW_ASCENT, RAW_DESCENT, RAW_PIXEL_SIZE, + and RAW_POINT_SIZE properties for the FreeType backend (Bugzilla #1163, + Chisato Yamauchi). + 816. Fix a FreeType backend problem with the font ascent/descent being + incorrect with some fonts (Bugzilla #1163, Chisato Yamauchi, reported by + Michael Lampe). + 815. Fix for detection of hardwired panel for the via driver (Bugzilla #813, + Luc Verhaegen, reported by Johannes Specht). + 814. Fix missing ';' in via_driver.c hidden by an empty macro (Bugzilla #813, + Luc Verhaegen). + 813. Add FT_Get_Postscript_Name() to the freetype2 export list for OS/2. + This is needed for the recent PostScript fontname property fix + (Bugzilla #1189, Frank Giessler). + 812. Fix MGA driver for big endian and EXTRADEBUG compilation (derived from + #6132, Rene Rebe). + 811. Turn off the GetDisplayInfo BIOS call by default and add an option + to turn it back on in the i810 driver. This fixes some lockup + problems found with some Dell BIOS' (Alan Hourihane, Alain Poirier). + 810. Fix compile issue in imstt driver (#6140, Rene Rebe) + 809. Only reset primary head of a Radeon (#6133, Rene Rebe). + 808. Fix big-endian typo in xf86CopyYUV12ToPacked (#6131, Rene Rebe). + 807. Fix neomagic white screen/lockup bug introduced in 4.3.99.15 (Bugzilla + #1179, #1157, David Dawes). + 806. Fixing DPMS: let modification of DPMS timeout take effect immeditately, + don't activate DPMS when disabled (Egbert Eich). XFree86 4.3.99.903 (15 February 2004) 805. Resync the pci.ids data with pciids.sf.net (2004-02-15 snapshot). @@ -18646,7 +18683,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3145 2004/02/16 01:01:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3156 2004/02/29 04:25:24 martin Exp $ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG.ND b/hw/xfree86/doc/changelogs/CHANGELOG.ND index 3c9e1e1f69..5f0d87780d 100644 --- a/hw/xfree86/doc/changelogs/CHANGELOG.ND +++ b/hw/xfree86/doc/changelogs/CHANGELOG.ND @@ -415,4 +415,4 @@ XFree86 3.9j (12 July 1997) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.2 1998/07/31 10:41:14 dawes Exp $ diff --git a/hw/xfree86/doc/devel/Domain.note b/hw/xfree86/doc/devel/Domain.note index 3db2aefae9..ce0812b22b 100644 --- a/hw/xfree86/doc/devel/Domain.note +++ b/hw/xfree86/doc/devel/Domain.note @@ -156,4 +156,4 @@ Most drivers currently used on ix86 need(ed) source code changes. multi-domain architectures, and support for Mach64 variants as non-primary heads is not yet available. -$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $ +$XFree86$ diff --git a/hw/xfree86/doc/devel/README.DRIcomp b/hw/xfree86/doc/devel/README.DRIcomp index 0f1bd1b694..7dab2b1089 100644 --- a/hw/xfree86/doc/devel/README.DRIcomp +++ b/hw/xfree86/doc/devel/README.DRIcomp @@ -554,4 +554,4 @@ trouble shooting and how to use the DRI-enabled X server for 3D applications. Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $ +$XFree86: $ diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry index 9c41113481..d766221570 100644 --- a/hw/xfree86/doc/devel/Registry +++ b/hw/xfree86/doc/devel/Registry @@ -407,4 +407,4 @@ and underscores removed. -$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $ diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml index 864b5c249e..0478a05981 100644 --- a/hw/xfree86/doc/sgml/DESIGN.sgml +++ b/hw/xfree86/doc/sgml/DESIGN.sgml @@ -36,7 +36,7 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 2003/12/19 20:38:57 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.53 2003/08/23 14:10:14 dawes Exp $ diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index f2a0561add..71c943fec8 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.40 2004/01/30 14:31:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 80602d3dd1..1495344171 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 873f3428a2..2f49ef0556 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.6 2001/12/10 19:07:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.5 2001/06/15 21:22:39 dawes Exp $ */ /* * Authors: diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index e733ac2109..6d90d770a4 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index fcb4b59bd6..d4d83df930 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ /** * \file sarea.h * SAREA definitions. @@ -34,7 +34,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 3df0cca595..bc8a17ad20 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.13 2003/09/24 02:43:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.12 2002/12/14 01:36:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dummylib/README b/hw/xfree86/dummylib/README index 8e5b539a69..4e270307a3 100644 --- a/hw/xfree86/dummylib/README +++ b/hw/xfree86/dummylib/README @@ -4,4 +4,4 @@ There is one symbol per source/object so that each can be overriden individually by whatever uses this library. -$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $ +$XFree86$ diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index d8a0d285a8..5835446bff 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifndef _DUMMY_LIB_H #define _DUMMY_LIB_H diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index 3c482b480e..ec437d8df6 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index a16126842a..c1b0fa9881 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 75634d7f3d..6b910d5b35 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 4259f678e1..d6e5c65a1e 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index e36a590e77..30bc93e71d 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 63d3ff8c71..4b7226e170 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index ea24fc1dca..006a6382ae 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 1f61eda4dc..f0cb2e1271 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 5780d9c134..c6f8e523f1 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index b7c0ddb537..f6164a8da2 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 122f46d435..33f05ec9c6 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 61c3e02a2c..4ad5a1a515 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 51b785a73e..50701741fb 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index a4255698f8..410d7b6454 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index d7b95b4306..d488d36156 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 2d36bea973..e002948a2d 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index f460b6b9f9..308f6230d3 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index dd00635b0a..b660d45b3c 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 031b6e55ab..8d95914429 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 8339c658b6..2f959a95c6 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 877bd6fd75..1f4614ba3b 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 752cdb0448..0345aa41f6 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */ /* all driver need this */ #include "xf86.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc47f9055..219ca07d32 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhw.man.pre b/hw/xfree86/fbdevhw/fbdevhw.man.pre index dadc1f9a36..e1ebe5c51f 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.man.pre +++ b/hw/xfree86/fbdevhw/fbdevhw.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ .TH FBDEVHW __drivermansuffix__ __vendorversion__ .SH NAME fbdevhw \- os-specific submodule for framebuffer device access diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index b262be90fb..dc1169362a 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ #include "xf86.h" #include "xf86cmap.h" diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index d651e5129d..f4017fb2ae 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -2,7 +2,7 @@ * copyed from from linux kernel 2.2.4 * removed internal stuff (#ifdef __KERNEL__) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ #ifndef _LINUX_FB_H #define _LINUX_FB_H diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre index fcf1a61619..79db0b1004 100644 --- a/hw/xfree86/getconfig/cfg.man.pre +++ b/hw/xfree86/getconfig/cfg.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ +.\" $XFree86$ .TH getconfig __filemansuffix__ __vendorversion__ .SH NAME getconfig - meta configuration files for getconfig(1) diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample index acf262d1a0..62d06ad38d 100644 --- a/hw/xfree86/getconfig/cfg.sample +++ b/hw/xfree86/getconfig/cfg.sample @@ -1,5 +1,5 @@ # $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/11/12 04:52:15 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $ # Some sample XFree86 getconfig rules file. diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre index 16c472fc52..6b43047c3a 100644 --- a/hw/xfree86/getconfig/getconfig.man.pre +++ b/hw/xfree86/getconfig/getconfig.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ +.\" $XFree86$ .TH getconfig 1 __vendorversion__ .SH NAME getconfig - get configuration information for the XFree86 server diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index a7f5adf1a2..55a6cb0595 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -6,7 +6,7 @@ * (c) 1998 Gerd Knorr */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ #if 1 #include "misc.h" diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index e7423155ac..b6ef41febf 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -2,7 +2,7 @@ * Copyright (C) 1998 Itai Nahshon, Michael Schimek */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c index de923b2f05..8f0c56f59e 100644 --- a/hw/xfree86/i2c/xf86i2cmodule.c +++ b/hw/xfree86/i2c/xf86i2cmodule.c @@ -5,7 +5,7 @@ * (c) 1998 Gerd Knorr */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO index bba0c774fa..e2154c1c31 100644 --- a/hw/xfree86/int10/INT10.HOWTO +++ b/hw/xfree86/int10/INT10.HOWTO @@ -341,4 +341,4 @@ XF86_AL,XF86_BL,XF86_CL,XF86_DL to access the lower byte of the AX,BX,CX and DX register. -$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $ diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 845c8a1774..01bb4c30a8 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 181ebb157c..76c2a1e3d9 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.27 2003/12/23 22:32:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.26 2003/11/06 18:38:12 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 6de89c5d92..c0433773dc 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index debd842e71..7c95171d43 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.12 2002/04/04 14:05:51 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.11 2001/10/01 13:44:13 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index f6b38580c6..c54de2461d 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.4 2002/04/04 14:05:51 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.2 2000/02/12 03:39:57 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index a74bbeacd1..e88c6500d5 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.11 2003/03/21 22:26:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 843902c5e9..c17e95d160 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c index 9e679ca6a0..5857d23d2b 100644 --- a/hw/xfree86/int10/xf86int10module.c +++ b/hw/xfree86/int10/xf86int10module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10module.c,v 1.2 2002/09/16 18:06:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 6998a08807..ffee4fb9a6 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.13 2002/09/16 18:06:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index 67c37d5f4b..27ff6fc142 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.2 2001/01/06 20:19:13 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.1 2000/01/23 04:44:35 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/loader/SparcMulDiv.S b/hw/xfree86/loader/SparcMulDiv.S index e7281593c5..11139d192d 100644 --- a/hw/xfree86/loader/SparcMulDiv.S +++ b/hw/xfree86/loader/SparcMulDiv.S @@ -22,7 +22,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/SparcMulDiv.S,v 1.1 2000/11/02 19:10:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SparcMulDiv.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ .globl urem_sparcv89, umul_sparcv89, udiv_sparcv89 .globl rem_sparcv89, mul_sparcv89, div_sparcv89 diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h index cd78075315..0fe454e978 100644 --- a/hw/xfree86/loader/aout.h +++ b/hw/xfree86/loader/aout.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.8 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.7 2002/05/31 18:46:00 dawes Exp $ */ /* * Borrowed from NetBSD's exec_aout.h diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index f77b3d73c3..0a48779779 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.20 2003/10/15 17:46:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.19 2003/10/15 16:58:34 dawes Exp $ */ /* * diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h index b0e1563193..7aeaf41fe2 100644 --- a/hw/xfree86/loader/aoutloader.h +++ b/hw/xfree86/loader/aoutloader.h @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */ #ifndef _AOUTLOADER_H #define _AOUTLOADER_H diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h index 956b810a0c..3129d1c72b 100644 --- a/hw/xfree86/loader/ar.h +++ b/hw/xfree86/loader/ar.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */ #ifndef _AR_H #define _AR_H diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h index 52553278ee..54a8cb57fd 100644 --- a/hw/xfree86/loader/coff.h +++ b/hw/xfree86/loader/coff.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.6 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.5 1998/07/25 16:56:12 dawes Exp $ */ /* This file was implemented from the information in the book Understanding and Using COFF diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index 1ba45dd671..164c7d167e 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.22 2003/12/22 17:48:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.21tsi Exp $ */ /* * diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h index 2174746711..3d67284811 100644 --- a/hw/xfree86/loader/coffloader.h +++ b/hw/xfree86/loader/coffloader.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ #ifndef _COFFLOADER_H #define _COFFLOADER_H diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 558533f4d7..4ef590eacf 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -345,6 +345,7 @@ LOOKUP dixLookupTab[] = { SYMFUNC(TimerFree) SYMFUNC(TimerSet) SYMFUNC(TimerCancel) + SYMFUNC(SetDPMSTimers) /* io.c */ SYMFUNC(WriteToClient) SYMFUNC(SetCriticalOutputPending) diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index e9468e97b3..51f0520e66 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */ #ifndef _DLLOADER_H #define _DLLOADER_H diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h index 91130e63d0..a523eac845 100644 --- a/hw/xfree86/loader/elf.h +++ b/hw/xfree86/loader/elf.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.17 2003/10/15 16:29:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.16 2003/06/12 14:12:34 eich Exp $ */ typedef unsigned int Elf32_Addr; typedef unsigned short Elf32_Half; diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index e3c70d0c6d..0f34a3a368 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -1,5 +1,5 @@ /* $XdotOrg$ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.62 2003/11/06 18:38:13 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */ /* * diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h index e4693411bc..0a42d70602 100644 --- a/hw/xfree86/loader/elfloader.h +++ b/hw/xfree86/loader/elfloader.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.4 2003/10/15 16:29:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */ #ifndef _ELFLOADER_H #define _ELFLOADER_H diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index 35900babf2..6626dae6ad 100644 --- a/hw/xfree86/loader/hash.c +++ b/hw/xfree86/loader/hash.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */ /* * diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h index 96cd41c025..88b525669a 100644 --- a/hw/xfree86/loader/hash.h +++ b/hw/xfree86/loader/hash.h @@ -21,7 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.3 1998/07/25 16:56:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ #ifndef _HASH_H #define _HASH_H diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h index e937b9f08e..0e18959c3b 100644 --- a/hw/xfree86/loader/sym.h +++ b/hw/xfree86/loader/sym.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.7 2003/10/15 16:29:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.6 2000/10/24 00:06:55 anderson Exp $ */ /* * diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib index 27af6b3f25..43312e4e8a 100644 --- a/hw/xfree86/os-support/README.OS-lib +++ b/hw/xfree86/os-support/README.OS-lib @@ -497,7 +497,7 @@ xf86cos(double x) -$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.10 2001/12/17 20:00:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.9 2001/07/23 13:15:48 dawes Exp $ diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 655ac4a834..bab184e7cc 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -117,6 +117,8 @@ has_bwx(void) #endif } #else /* __NetBSD__ */ +static unsigned long hae_thresh = (1UL << 24); +static unsigned long hae_mask = 0xf8000000UL; /* XXX - should use xf86AXP.c */ static struct alpha_bus_window *abw; static int abw_count = -1; @@ -448,9 +450,7 @@ xf86EnableInterrupts() #define vuip volatile unsigned int * -#ifndef __NetBSD__ static unsigned long msb_set = 0; -#endif static pointer memSBase = 0; static pointer memBase = 0; @@ -558,22 +558,20 @@ static int readSparse8(pointer Base, register unsigned long Offset) { register unsigned long result, shift; -#ifndef __NetBSD__ register unsigned long msb; -#endif mem_barrier(); Offset += (unsigned long)Base - (unsigned long)memBase; shift = (Offset & 0x3) << 3; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif result = *(vuip) ((unsigned long)memSBase + (Offset << 5)); result >>= shift; return 0xffUL & result; @@ -583,23 +581,21 @@ static int readSparse16(pointer Base, register unsigned long Offset) { register unsigned long result, shift; -#ifndef __NetBSD__ register unsigned long msb; -#endif mem_barrier(); Offset += (unsigned long)Base - (unsigned long)memBase; shift = (Offset & 0x2) << 3; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif result = *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))); result >>= shift; return 0xffffUL & result; @@ -615,46 +611,42 @@ readSparse32(pointer Base, register unsigned long Offset) static void writeSparse8(int Value, pointer Base, register unsigned long Offset) { -#ifndef __NetBSD__ register unsigned long msb; -#endif register unsigned int b = Value & 0xffU; write_mem_barrier(); Offset += (unsigned long)Base - (unsigned long)memBase; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101; } static void writeSparse16(int Value, pointer Base, register unsigned long Offset) { -#ifndef __NetBSD__ register unsigned long msb; -#endif register unsigned int w = Value & 0xffffU; write_mem_barrier(); Offset += (unsigned long)Base - (unsigned long)memBase; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) = w * 0x00010001; @@ -671,44 +663,40 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset) static void writeSparseNB8(int Value, pointer Base, register unsigned long Offset) { -#ifndef __NetBSD__ register unsigned long msb; -#endif register unsigned int b = Value & 0xffU; Offset += (unsigned long)Base - (unsigned long)memBase; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101; } static void writeSparseNB16(int Value, pointer Base, register unsigned long Offset) { -#ifndef __NetBSD__ register unsigned long msb; -#endif register unsigned int w = Value & 0xffffU; Offset += (unsigned long)Base - (unsigned long)memBase; -#ifndef __NetBSD__ if (Offset >= (hae_thresh)) { msb = Offset & hae_mask ; Offset -= msb; if (msb_set != msb) { +#ifndef __NetBSD__ sethae(msb); +#endif msb_set = msb; } } -#endif *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) = w * 0x00010001; } diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 36943add12..cfea026023 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.2 2003/03/14 13:46:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.1tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 6c675b5da0..9702ff0c7a 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.9 2003/10/02 13:30:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index a47dc23844..c0a8f88907 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ +/* $XFree86$ */ /* * Slightly modified xf86KbdBSD.c which is diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index adb101dc5a..ea3271629a 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index 250e5cb554..6ed48d89b6 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 91367078eb..0f392a8a02 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.3 2003/10/07 22:33:37 herrb Exp $ */ +/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index ec95306e88..2952e94013 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index e4927d91a7..c76c9f7485 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.22 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 0f40ba7075..d4689ce212 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 7f24124dcf..93626b6f81 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -23,7 +23,7 @@ /* Modified for FreeBSD by David Dawes */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 3c22eeb4d2..871bd2411b 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.9 2004/01/07 17:05:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.8 2003/11/04 03:16:58 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h index c042d88bff..7b9cd434e2 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.h +++ b/hw/xfree86/os-support/bsd/bsd_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ +/* $XFree86$ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index 74345654b5..37139e8dd9 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */ +/* $XFree86$ */ #include #include diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 75c8f82001..3c55ee72f6 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.5 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.4 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index bb84e5566e..3d88b075f9 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index f754189645..a3bc237dc9 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index 8c1a8b8a29..8e1c802c97 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index 9338e61d46..eb51a2fcca 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/usb.3 b/hw/xfree86/os-support/bsd/libusb/usb.3 index f88a28cd64..db0b1b08f4 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.3 +++ b/hw/xfree86/os-support/bsd/libusb/usb.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.3,v 1.1 2000/02/11 18:06:50 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.3,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ .\" .Dd May 11, 1999 .Dt USB 3 diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h index 69ef79a623..445428118a 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.h +++ b/hw/xfree86/os-support/bsd/libusb/usb.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ #define _DIAGASSERT(e) assert(e) diff --git a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages index 711ba206a2..48c7b1351b 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages +++ b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages @@ -9,7 +9,7 @@ # If the number is * then the line matches all usages and the name # is a printf formatting string that will be given the usage number. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb_hid_usages,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ # 1 Generic Desktop 0x00 Undefined diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h index cb0bf33ecc..60883dd47c 100644 --- a/hw/xfree86/os-support/bsd/libusb/usbvar.h +++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usbvar.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ struct report_desc { unsigned int size; diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 99be9ea2f5..f1d22f4fae 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -3,7 +3,7 @@ * * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */ +/* $XFree86$ */ #ifndef _MEMRANGE_H #define _MEMRANGE_H diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 3e4ff9ee74..af2867f905 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.6 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index fe301acf53..760bf78b35 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.3 2003/10/07 23:14:55 herrb Exp $ */ +/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 57262efa25..f81112474f 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 04ff8b9567..d218a0d2f2 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index 06baa69ea2..3b2bf5a9b5 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.6 2003/10/02 13:30:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 76194802f3..4846ee0ed4 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.10 2002/11/17 18:42:01 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.9 2002/09/24 16:14:16 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 2aa98355b9..7b00acb6bf 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.9 2002/08/27 22:07:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.8 2002/07/24 19:06:52 tsi Exp $ */ /* * ppcPci.c - PowerPC PCI access functions * diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 1f5f03bd26..dbd17810f1 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.6 2003/10/02 13:30:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ #ifndef _XF86_SBUS_H #define _XF86_SBUS_H diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c index 8be822445b..8192e97eb5 100644 --- a/hw/xfree86/os-support/drm/drmmodule.c +++ b/hw/xfree86/os-support/drm/drmmodule.c @@ -25,7 +25,7 @@ * * Authors: Rickard E. (Rik) Faith * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $ * */ diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index bacfa90322..984c79122b 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -389,7 +389,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) return pInt; error4: - xf86DrvMsg(screen, X_ERROR, "shmat() call retruned errno %d\n", errno); + xf86DrvMsg(screen, X_ERROR, "shmat() call returned errno %d\n", errno); error3: if (base_high) shmdt(base_high); diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index dc737ac479..e9cb6125aa 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.3 2003/11/03 05:36:33 tsi Exp $ */ +/* $XFree86$ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index f2dd16267f..b2adcd5142 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h,v 3.3 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: Exp $ */ #ifndef LNX_H_ # ifdef __alpha__ diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index bd038351f4..25ef8cc910 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.19 2004/02/04 16:30:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.18 2002/01/25 21:56:19 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 25639d72dd..993679d81b 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86$ */ /* * Slightly modified xf86KbdLnx.c which is diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index acac20bce5..58f1062da6 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -7,7 +7,7 @@ * Copyright © 2001 The XFree86 Project, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index f2f3269591..1f9142a6ba 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index 5813ef4e9a..106aa28042 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ #include #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index bfcb0d70fc..8381fec27f 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index d818fabdf8..ea305e38dd 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 7631a1ff00..cef6f9747c 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.26 2003/11/17 22:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 2423bd45ef..90a8bc1061 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,7 +23,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index ba18f28a1e..d120f921cc 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.5 2003/11/04 03:14:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h index ac783bfbcf..7b9cd434e2 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.h +++ b/hw/xfree86/os-support/linux/lnx_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86$ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 0cb69b2091..cf18bcab65 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ #include #include diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 5477b9130d..41f76fd16e 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ #include #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index ad3a17fa22..5144cdf3e4 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.68 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 8565dcc5c3..1787a7c8c9 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -22,7 +22,7 @@ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index e61ce76b70..3ace8f447a 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index dcf734965e..fd45ba4ec6 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 858b0eb650..7d6bedec94 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c index e587b7ee06..12fa3bcae0 100644 --- a/hw/xfree86/os-support/lynxos/lynx_ppc.c +++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index c667994b30..297d93bdfb 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.18 2002/12/14 04:41:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ #include "X.h" #include "input.h" diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.S b/hw/xfree86/os-support/misc/BUSmemcpy.S index e4ff36c628..83dab6f677 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.S +++ b/hw/xfree86/os-support/misc/BUSmemcpy.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */ /****************************************************************************** Copyright 1993 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index acef268a13..27d53fa8fe 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -12,7 +12,7 @@ Thanks to Linus Torvalds for contributing this code. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index b5de1d899a..ce99e792a2 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ #ifdef __UNIXOS2__ #define I_NEED_OS2_H diff --git a/hw/xfree86/os-support/misc/IODelay.S b/hw/xfree86/os-support/misc/IODelay.S index 4c6e32f3fe..6855846530 100644 --- a/hw/xfree86/os-support/misc/IODelay.S +++ b/hw/xfree86/os-support/misc/IODelay.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */ /******************************************************************************* Copyright 1994 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 57176c5d5d..e14a86f919 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -4,7 +4,7 @@ Stub for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ #include "X.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/misc/PortIO.S b/hw/xfree86/os-support/misc/PortIO.S index 61aac6b892..75db31156a 100644 --- a/hw/xfree86/os-support/misc/PortIO.S +++ b/hw/xfree86/os-support/misc/PortIO.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.1 2004/02/02 03:55:32 dawes Exp $ */ +/* $XFree86$ */ /* Port I/O functions for platforms with no inlining. */ diff --git a/hw/xfree86/os-support/misc/SlowBcopy.S b/hw/xfree86/os-support/misc/SlowBcopy.S index 9b6af1d69f..9fd73a0f99 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.S +++ b/hw/xfree86/os-support/misc/SlowBcopy.S @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.s,v 1.2 1998/07/25 16:56:50 dawes Exp $ */ /******************************************************************************* Copyright 1994 by Glenn G. Lai diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index a9a8beae79..727ec65989 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -4,7 +4,7 @@ for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.7 2004/02/11 22:06:21 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */ /* * Create a dependency that should be immune from the effect of register diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index 0191563575..4172d3d394 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index 7889617e32..1b73dc654d 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 899c3820b4..d4ae2852fe 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * Copyright 1993 by David McCullough diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 389664647e..2b8a05be5f 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index a018e34343..c9b7219cdd 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 85b4bbd41a..9138843852 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_iop.c,v 1.1 2002/06/03 21:22:10 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 37b9eb5a8b..445afe8223 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 3c00f55645..a11d957e1a 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 265a45f91c..6267da9a71 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 81aac54dee..4ddb844504 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 5c24b97510..c295c21468 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index ee7584222e..8f341e5e49 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/inout.S b/hw/xfree86/os-support/shared/inout.S index 80c47c4192..73a2cbbb60 100644 --- a/hw/xfree86/os-support/shared/inout.S +++ b/hw/xfree86/os-support/shared/inout.S @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.5 1996/12/23 06:50:58 dawes Exp $ */ #include "assyntax.h" diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index c24f4f1b24..fc1e832559 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 329346910d..934ebbdbaa 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 1bb2da386f..8e118938e7 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index e63619e3a6..5afef810c2 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */ +/* $XFree86$ */ #ifndef _XF86_AXP_H_ #define _XF86_AXP_H_ diff --git a/hw/xfree86/os-support/solaris/apSolaris.shar b/hw/xfree86/os-support/solaris/apSolaris.shar index 33cecdc4de..c8e2cfa499 100644 --- a/hw/xfree86/os-support/solaris/apSolaris.shar +++ b/hw/xfree86/os-support/solaris/apSolaris.shar @@ -1,5 +1,5 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar,v 1.3 2002/10/04 19:45:33 tsi Exp $ +# $XFree86$ # This is a shell archive (produced by GNU sharutils 4.2c). # To extract the files from this archive, save it to some FILE, remove # everything before the `!/bin/sh' line above, then type `sh FILE'. diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index e93e0e9ddf..dc984bd4b7 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.3 2003/11/07 13:45:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index b08529a007..fe8205e132 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/solaris/sun_inout.s b/hw/xfree86/os-support/solaris/sun_inout.s index e8f03d0e8f..5c0b23ef6e 100644 --- a/hw/xfree86/os-support/solaris/sun_inout.s +++ b/hw/xfree86/os-support/solaris/sun_inout.s @@ -1,4 +1,4 @@ -/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $ +/ $XFree86$ / / Copyright 1994-2001 The XFree86 Project, Inc. All Rights Reserved. / diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 27996d3123..9f3a235e51 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 058f1109a2..0213a07326 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.2 2003/10/09 11:44:00 pascal Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.1 2001/05/28 02:42:31 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index f6481af297..30cf288cac 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.6 2003/10/09 11:44:00 pascal Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2003/08/26 19:00:36 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 2f4b84e99f..02883f054a 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.3 2002/10/03 02:04:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.2 2001/10/28 03:34:03 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 1e9166712a..d8dea0f16e 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index d48efd76e0..c110f452e6 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index c0460f5242..2f7e4e7237 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.21 2003/03/14 13:46:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.20tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index 0478ee65e6..b8d8a90868 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993-1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h index 2085a3e70c..45df282752 100644 --- a/hw/xfree86/os-support/sysv/xqueue.h +++ b/hw/xfree86/os-support/sysv/xqueue.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XF86_XQUEUE_H_ #define _XF86_XQUEUE_H_ diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 917b115268..344f7e9019 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.6 2003/11/03 05:11:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 4d3205eb47..4df2d502aa 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.95 2003/11/17 22:20:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.94 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany * Copyright 1992 by David Dawes diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 09d3f2861f..b732702361 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -64,7 +64,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.57 2003/10/07 23:14:54 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index fa22e220d3..695c165050 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -24,7 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.14 2003/01/04 20:20:22 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.13 2003/01/01 19:22:20 paulo Exp $ * */ diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index 3cd3749ede..e2dbb3e919 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.6 2000/10/20 14:59:03 alanh Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index d8d5332f9b..2b8cf7171b 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.7 2002/09/16 18:06:18 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index c704bd75ec..783d79b935 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.3 1999/06/12 07:19:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c index f0a960a661..fd436ef855 100644 --- a/hw/xfree86/rac/xf86RACmodule.c +++ b/hw/xfree86/rac/xf86RACmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.4 1999/01/26 05:54:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 3b42ecb138..440b0021bc 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -23,7 +23,7 @@ * * BT RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index ea1180285c..c52b5a7456 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.3 1998/08/20 08:56:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ #include "xf86RamDac.h" diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index bea623b78c..67469d2ed3 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.2 1998/07/25 16:57:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ #include "BT.h" diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES index 3e901e3807..726e2edc14 100644 --- a/hw/xfree86/ramdac/CURSOR.NOTES +++ b/hw/xfree86/ramdac/CURSOR.NOTES @@ -188,4 +188,4 @@ Flags -$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.5 2003/02/13 20:28:41 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.4tsi Exp $ diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 34562e2970..69207c2e27 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -23,7 +23,7 @@ * * IBM RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.13 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index 5462966306..00d039031b 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.8 2001/10/28 03:34:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ #include diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 6fecb7705d..1a2bf2065d 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ #include "IBM.h" diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 5e466b7071..ce6dd9a04c 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -24,7 +24,7 @@ * Modified from IBM.c to support TI RAMDAC routines * by Jens Owen, . */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index 9451f814c9..f87ebd13f4 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.5 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ #include diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index d815527641..81fe844a18 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ #include "TI.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 49379e9348..eedb003778 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.20 2003/02/24 20:43:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index 5e5df46f32..ac88f4e5f5 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.11 2003/02/15 03:14:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 5a6ab118a9..603f8ecd00 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.5 2003/02/15 03:14:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 41b623a6a5..ad9977d67d 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.13 2003/03/04 21:21:15 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index b45be814d4..7821e591c8 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -23,7 +23,7 @@ * * Generic RAMDAC access routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 626a8b2b99..319a7b5779 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 3b01081df0..14cda093d4 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -23,7 +23,7 @@ * * Generic RAMDAC access to colormaps. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.7 2000/07/26 01:52:24 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index 7549496061..cb100d7bb5 100644 --- a/hw/xfree86/ramdac/xf86RamDacMod.c +++ b/hw/xfree86/ramdac/xf86RamDacMod.c @@ -23,7 +23,7 @@ * * Generic RAMDAC module. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index f1eeb3a7d3..45680a05bb 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.4 1999/07/18 03:27:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ #include "xf86RamDac.h" #include "xf86cmap.h" diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids index a4369e8c11..bfde79503c 100644 --- a/hw/xfree86/scanpci/extrapci.ids +++ b/hw/xfree86/scanpci/extrapci.ids @@ -15,7 +15,7 @@ # project (http://pciids.sf.net/). # # $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $ -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $ # # Vendors, devices and subsystems. Please keep sorted. diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 534c8973f5..cf12c42cc1 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.13 2003/08/24 17:37:10 dawes Exp $ */ /* * Display the Subsystem Vendor Id and Subsystem Id in order to identify * the cards installed in this computer diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c index 3bb14b0a9f..ad090d43cb 100644 --- a/hw/xfree86/shadowfb/sfbmodule.c +++ b/hw/xfree86/shadowfb/sfbmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.2 1999/02/01 12:08:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 093f35b303..fe69c62100 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -6,7 +6,7 @@ Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index d028980bda..e428226007 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.4 2003/02/18 19:10:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index b0d9de0589..c5b3c613a6 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -102,7 +102,7 @@ * o Error checking. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.3 2002/12/21 02:35:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53 tsi Exp $ */ #include diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre index f2d2ae9ec2..ea76684f3a 100644 --- a/hw/xfree86/utils/gtf/gtf.man.pre +++ b/hw/xfree86/utils/gtf/gtf.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $ +.\" $XFree86$ .TH GTF 1 __vendorversion__ .SH NAME gtf - calculate VESA GTF mode lines diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c index b977936d33..bd42f637ff 100644 --- a/hw/xfree86/utils/ioport/ioport.c +++ b/hw/xfree86/utils/ioport/ioport.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.5 2004/01/05 16:42:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */ /* * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index f7d07eb79f..3c3c535acf 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */ /* Keyboard mode control program for 386BSD */ diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre index 677663d7ee..3f7842cfdd 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.4 1998/04/05 02:28:42 dawes Exp $ .TH KBD_MODE 1 __vendorversion__ .SH NAME kbd_mode \- recover the PC console keyboard diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c index e70fb2db76..1b5c08563f 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.12 2003/10/07 21:39:43 herrb Exp $ */ +/* $XFree86: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */ /* static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13"; diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre index 528ed12f00..367b4fc9ae 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.6 2001/01/27 18:20:41 dawes Exp $ .\" .TH KBD_MODE 1 __xorgversion__ .SH NAME diff --git a/hw/xfree86/utils/pcitweak/pcitweak.man.pre b/hw/xfree86/utils/pcitweak/pcitweak.man.pre index 14cfa885f1..3549d9740d 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.man.pre +++ b/hw/xfree86/utils/pcitweak/pcitweak.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.4 2003/05/29 21:48:09 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ .TH PCITWEAK 1 __vendorversion__ .SH NAME pcitweak - read/write PCI config space diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index 6093bd31a4..5746269f57 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.92 2003/02/13 12:17:14 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre index baf2316039..2c9bcc964b 100644 --- a/hw/xfree86/utils/scanpci/scanpci.man.pre +++ b/hw/xfree86/utils/scanpci/scanpci.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.2 2000/12/11 20:18:45 dawes Exp $ .TH SCANPCI 1 __vendorversion__ .SH NAME scanpci - scan/probe PCI buses diff --git a/hw/xfree86/utils/xorgcfg/TODO b/hw/xfree86/utils/xorgcfg/TODO index 75fe91b95b..b830f7529f 100644 --- a/hw/xfree86/utils/xorgcfg/TODO +++ b/hw/xfree86/utils/xorgcfg/TODO @@ -1,4 +1,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,v 1.1 2001/07/04 16:09:14 paulo Exp $ +$XFree86$ o Have code to fetch the SymTabRec chipset list from a video driver. This is mostly useful for the testing tool/interface, so that the diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c index 40727ff625..53163e0707 100644 --- a/hw/xfree86/utils/xorgcfg/accessx.c +++ b/hw/xfree86/utils/xorgcfg/accessx.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.10 2002/12/05 19:31:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c index 5299025f1d..7db0e2f850 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.c +++ b/hw/xfree86/utils/xorgcfg/card-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h index 14411440de..156da456fb 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.h +++ b/hw/xfree86/utils/xorgcfg/card-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card.xbm b/hw/xfree86/utils/xorgcfg/card.xbm index b3cbba3228..231adcaaec 100644 --- a/hw/xfree86/utils/xorgcfg/card.xbm +++ b/hw/xfree86/utils/xorgcfg/card.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ #define card_width 50 #define card_height 44 diff --git a/hw/xfree86/utils/xorgcfg/card.xpm b/hw/xfree86/utils/xorgcfg/card.xpm index d682574699..32bccb689e 100644 --- a/hw/xfree86/utils/xorgcfg/card.xpm +++ b/hw/xfree86/utils/xorgcfg/card.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $ + * $XFree86$ */ static char * card_xpm[] = { "41 40 8 1", diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c index d5805fa98a..b63fb3393b 100644 --- a/hw/xfree86/utils/xorgcfg/cards.c +++ b/hw/xfree86/utils/xorgcfg/cards.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.15 2003/02/15 05:37:58 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $ */ #define CARDS_PRIVATE diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h index 0e5ee328fd..a6637a664c 100644 --- a/hw/xfree86/utils/xorgcfg/cards.h +++ b/hw/xfree86/utils/xorgcfg/cards.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.3 2002/07/15 20:46:04 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/computer.xpm b/hw/xfree86/utils/xorgcfg/computer.xpm index 75fc85b26b..9167e3eafc 100644 --- a/hw/xfree86/utils/xorgcfg/computer.xpm +++ b/hw/xfree86/utils/xorgcfg/computer.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $ + * $XFree86$ */ static char * computer_xpm[] = { "30 50 8 1", diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c index 8c2da3d9b8..e241b2e14c 100644 --- a/hw/xfree86/utils/xorgcfg/config.c +++ b/hw/xfree86/utils/xorgcfg/config.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index aa38d520fe..990f7d01d9 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.22 2004/02/14 17:53:49 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c index a3dfcbe2d7..bd01825857 100644 --- a/hw/xfree86/utils/xorgcfg/expert.c +++ b/hw/xfree86/utils/xorgcfg/expert.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c index 2ae68a082c..92283cd22c 100644 --- a/hw/xfree86/utils/xorgcfg/help.c +++ b/hw/xfree86/utils/xorgcfg/help.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h index f03e01b147..ba97da009d 100644 --- a/hw/xfree86/utils/xorgcfg/help.h +++ b/hw/xfree86/utils/xorgcfg/help.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $ + * $XFree86$ */ /* help string definitions */ diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index 68a1873ed6..053b822571 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 87989fdc26..3482653b82 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.22 2003/01/01 19:22:24 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h index 6ff63c0023..9de55e65e2 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.3 2001/03/02 22:39:27 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xbm b/hw/xfree86/utils/xorgcfg/keyboard.xbm index 69d4aac42d..5114bee3ef 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard.xbm +++ b/hw/xfree86/utils/xorgcfg/keyboard.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $ + * $XFree86$ */ #define keyboard_width 50 #define keyboard_height 44 diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xpm b/hw/xfree86/utils/xorgcfg/keyboard.xpm index 5ef7b605da..200ba7f428 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard.xpm +++ b/hw/xfree86/utils/xorgcfg/keyboard.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $ + * $XFree86$ */ static char * card_xpm[] = { "60 28 5 1", diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 71ac17d80d..e4c58f7e8d 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade * * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index f3f8490bc4..3ba5b937a6 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.7 2001/07/09 23:45:24 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index e3f4e9f478..83d1d0586f 100644 --- a/hw/xfree86/utils/xorgcfg/loadmod.c +++ b/hw/xfree86/utils/xorgcfg/loadmod.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c index 6ed0954168..04def80e25 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h index 03ca18a414..b7b16e15bc 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.3 2000/11/30 20:55:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor.xbm b/hw/xfree86/utils/xorgcfg/monitor.xbm index c4b01eb742..972388a92f 100644 --- a/hw/xfree86/utils/xorgcfg/monitor.xbm +++ b/hw/xfree86/utils/xorgcfg/monitor.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ #define monitor_width 50 #define monitor_height 44 diff --git a/hw/xfree86/utils/xorgcfg/monitor.xpm b/hw/xfree86/utils/xorgcfg/monitor.xpm index c694edf2e5..e647e3cc10 100644 --- a/hw/xfree86/utils/xorgcfg/monitor.xpm +++ b/hw/xfree86/utils/xorgcfg/monitor.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ static char * monitor_xpm[] = { "47 40 6 1", diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 17a1c0caff..779f211307 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h index 249f508406..6c67d9d5e9 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse.xbm b/hw/xfree86/utils/xorgcfg/mouse.xbm index 8577137e63..3f6bce72ff 100644 --- a/hw/xfree86/utils/xorgcfg/mouse.xbm +++ b/hw/xfree86/utils/xorgcfg/mouse.xbm @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $ + * $XFree86$ */ #define mouse_width 50 #define mouse_height 44 diff --git a/hw/xfree86/utils/xorgcfg/mouse.xpm b/hw/xfree86/utils/xorgcfg/mouse.xpm index 7ad21fb8f5..ea157c2665 100644 --- a/hw/xfree86/utils/xorgcfg/mouse.xpm +++ b/hw/xfree86/utils/xorgcfg/mouse.xpm @@ -27,7 +27,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $ + * $XFree86$ */ static char * mouse_xpm[] = { "26 35 8 1", diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c index 10828a94a7..8aa9a09a8d 100644 --- a/hw/xfree86/utils/xorgcfg/options.c +++ b/hw/xfree86/utils/xorgcfg/options.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.12 2001/11/03 20:32:31 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $ */ #include "options.h" diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h index a900726072..4194593d1e 100644 --- a/hw/xfree86/utils/xorgcfg/options.h +++ b/hw/xfree86/utils/xorgcfg/options.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.7 2001/07/06 02:04:10 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c index 9390afc6d3..26e675a8fc 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.c +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h index a152f61881..c7174b626a 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.h +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c index 25fd5f2902..80f4235af3 100644 --- a/hw/xfree86/utils/xorgcfg/screen.c +++ b/hw/xfree86/utils/xorgcfg/screen.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h index 7c3e2c75fe..624d87b968 100644 --- a/hw/xfree86/utils/xorgcfg/screen.h +++ b/hw/xfree86/utils/xorgcfg/screen.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.3 2000/12/01 18:31:07 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 23b0ecf5a9..038f21d38f 100644 --- a/hw/xfree86/utils/xorgcfg/startx.c +++ b/hw/xfree86/utils/xorgcfg/startx.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.8 2002/10/19 20:04:21 herrb Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index 6496bc868c..7028510773 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.c +++ b/hw/xfree86/utils/xorgcfg/stubs.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h index d554ac17a2..e9cfbe2e0a 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.h +++ b/hw/xfree86/utils/xorgcfg/stubs.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.3 2001/08/01 00:44:57 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $ */ #ifndef _xf86cfg_stubs_h diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 2011d1abd6..3a257d0474 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c index 3a51310d96..595abf419c 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.c +++ b/hw/xfree86/utils/xorgcfg/vidmode.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $ */ /* diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h index e445517cdb..8cdc4dc928 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.h +++ b/hw/xfree86/utils/xorgcfg/vidmode.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.3 2001/07/07 23:00:43 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $ */ #ifndef _xf86cfg_vidmode_h diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c index cb4054a5eb..e36915888f 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.c +++ b/hw/xfree86/utils/xorgcfg/xf86config.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h index 575c3c9d01..1095246b7a 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.h +++ b/hw/xfree86/utils/xorgcfg/xf86config.h @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.4 2000/11/30 20:55:18 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index 83d8840ea7..857135de4b 100644 --- a/hw/xfree86/utils/xorgconfig/Cards +++ b/hw/xfree86/utils/xorgconfig/Cards @@ -18,7 +18,7 @@ # The majority of entries are just a binding of a model name to a # chipset/server and untested. # -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.79 2002/10/16 01:31:05 dawes Exp $ # VGA diff --git a/hw/xfree86/utils/xorgconfig/Cards98 b/hw/xfree86/utils/xorgconfig/Cards98 index cfd96dc164..ef14a0345c 100644 --- a/hw/xfree86/utils/xorgconfig/Cards98 +++ b/hw/xfree86/utils/xorgconfig/Cards98 @@ -1,4 +1,4 @@ -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree98/xf86config/Cards98,v 1.7 1998/06/04 16:43:45 hohndel Exp $ # # # diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index 8aac066064..d5f405f4a1 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index c5299e8991..1d98924911 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */ diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 07659d9434..9cc8be74d1 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 3a1b487495..2f49ffd9b2 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index ae16d7b758..b3951f8f9a 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -27,7 +27,7 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index b3c57b917e..c37cbd8bf1 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -26,7 +26,7 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ #ifndef _VBE_MODES_H diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index 65b161a2c6..0347f7fb71 100644 --- a/hw/xfree86/vbe/vbe_module.c +++ b/hw/xfree86/vbe/vbe_module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */ #include "xf86.h" #include "xf86str.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index a70f572b57..28f8b6fc7d 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c index 7519b35c31..481374d532 100644 --- a/hw/xfree86/x86emu/debug.c +++ b/hw/xfree86/x86emu/debug.c @@ -36,7 +36,7 @@ * emulator. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.2 2000/04/05 18:13:14 dawes Exp $ */ #include "x86emu/x86emui.h" #ifdef IN_MODULE diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c index 711c8dc839..45a1a4b4c7 100644 --- a/hw/xfree86/x86emu/decode.c +++ b/hw/xfree86/x86emu/decode.c @@ -38,7 +38,7 @@ ****************************************************************************/ /* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */ -/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/fpu.c b/hw/xfree86/x86emu/fpu.c index 0f679bde62..4b801dc94c 100644 --- a/hw/xfree86/x86emu/fpu.c +++ b/hw/xfree86/x86emu/fpu.c @@ -36,7 +36,7 @@ * emulation of the FPU instructions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/fpu.c,v 1.2 2003/10/22 20:03:06 tsi Exp $ */ +/* $XFree86$ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c index 94041f6c8c..88ee7e1084 100644 --- a/hw/xfree86/x86emu/ops.c +++ b/hw/xfree86/x86emu/ops.c @@ -70,7 +70,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.9 2003/10/22 20:03:06 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.8tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c index 47c49ad52f..7cb585bc89 100644 --- a/hw/xfree86/x86emu/ops2.c +++ b/hw/xfree86/x86emu/ops2.c @@ -37,7 +37,7 @@ * instructions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.7 2004/02/06 17:15:28 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.6tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c index d493ae8379..39941360de 100644 --- a/hw/xfree86/x86emu/sys.c +++ b/hw/xfree86/x86emu/sys.c @@ -39,7 +39,7 @@ * user library. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.7 2002/12/24 17:42:58 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.6 2002/09/16 18:05:18 eich Exp $ */ #include "x86emu.h" #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/x86emu.h b/hw/xfree86/x86emu/x86emu.h index de989b83f5..1df9ac50df 100644 --- a/hw/xfree86/x86emu/x86emu.h +++ b/hw/xfree86/x86emu/x86emu.h @@ -37,7 +37,7 @@ * include this header * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu.h,v 1.3 2002/09/16 18:05:17 eich Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_X86EMU_H #define __X86EMU_X86EMU_H diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h index 56221cbbaf..8abedf6160 100644 --- a/hw/xfree86/x86emu/x86emu/debug.h +++ b/hw/xfree86/x86emu/x86emu/debug.h @@ -35,7 +35,7 @@ * Description: Header file for debug definitions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.4 2000/11/21 23:10:27 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */ #ifndef __X86EMU_DEBUG_H #define __X86EMU_DEBUG_H diff --git a/hw/xfree86/x86emu/x86emu/decode.h b/hw/xfree86/x86emu/x86emu/decode.h index d134f42949..bb2bc0bee8 100644 --- a/hw/xfree86/x86emu/x86emu/decode.h +++ b/hw/xfree86/x86emu/x86emu/decode.h @@ -35,7 +35,7 @@ * Description: Header file for instruction decoding logic. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/decode.h,v 1.3 2002/07/23 01:51:03 tsi Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_DECODE_H #define __X86EMU_DECODE_H diff --git a/hw/xfree86/x86emu/x86emu/fpu_regs.h b/hw/xfree86/x86emu/x86emu/fpu_regs.h index b975b87e07..a125075b77 100644 --- a/hw/xfree86/x86emu/x86emu/fpu_regs.h +++ b/hw/xfree86/x86emu/x86emu/fpu_regs.h @@ -35,7 +35,7 @@ * Description: Header file for FPU register definitions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.3 2003/10/28 16:01:40 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.2 2003/10/22 20:03:05 tsi Exp $ */ #ifndef __X86EMU_FPU_REGS_H #define __X86EMU_FPU_REGS_H diff --git a/hw/xfree86/x86emu/x86emu/prim_asm.h b/hw/xfree86/x86emu/x86emu/prim_asm.h index 4fa8d55034..041255f186 100644 --- a/hw/xfree86/x86emu/x86emu/prim_asm.h +++ b/hw/xfree86/x86emu/x86emu/prim_asm.h @@ -39,7 +39,7 @@ * platform. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_PRIM_ASM_H #define __X86EMU_PRIM_ASM_H diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h index 3a45801385..fba2991d48 100644 --- a/hw/xfree86/x86emu/x86emu/regs.h +++ b/hw/xfree86/x86emu/x86emu/regs.h @@ -35,7 +35,7 @@ * Description: Header file for x86 register definitions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.6 2003/10/28 16:01:40 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.5 2003/10/22 20:03:05 tsi Exp $ */ #ifndef __X86EMU_REGS_H #define __X86EMU_REGS_H diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h index 3a0dc17fc0..f31d77fe63 100644 --- a/hw/xfree86/x86emu/x86emu/types.h +++ b/hw/xfree86/x86emu/x86emu/types.h @@ -36,7 +36,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.7 2003/07/07 15:34:21 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.6 2003/06/12 14:12:26 eich Exp $ */ #ifndef __X86EMU_TYPES_H #define __X86EMU_TYPES_H diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h index 9cdb0a1b3b..3adf61ec69 100644 --- a/hw/xfree86/x86emu/x86emu/x86emui.h +++ b/hw/xfree86/x86emu/x86emu/x86emui.h @@ -38,7 +38,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.4 2001/04/01 13:59:58 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.3 2000/04/17 16:29:47 eich Exp $ */ #ifndef __X86EMU_X86EMUI_H #define __X86EMU_X86EMUI_H diff --git a/hw/xfree86/xaa/XAA.HOWTO b/hw/xfree86/xaa/XAA.HOWTO index 95d9d61009..cbd71c1386 100644 --- a/hw/xfree86/xaa/XAA.HOWTO +++ b/hw/xfree86/xaa/XAA.HOWTO @@ -1424,4 +1424,4 @@ void DisableClipping (ScrnInfoPtr pScrn) pixmap with a particular dimension is allowed, then your driver will be expected to render primitives as large as that pixmap. -$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $ diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index f183f8f023..98db3cf501 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 83850767a7..5bde21cbe3 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */ /* This is a lighter version of cfbBitBlt. We calculate the boxes diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index d7f3ba2a38..ce19a853e2 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ #include "Xmd.h" CARD32 XAAReverseBitOrder(CARD32 v); diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 9a8749dbfb..272b9fb42f 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 497c3e7a17..7a036937bf 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index d3d1c8a5c2..9e17a187fe 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index b77be1ad6b..e4439c447b 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 212116ae43..e5eba78196 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 01b4bb4083..6bc7bfed3c 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 352d8e0841..95ecf257b9 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -21,7 +21,7 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 5566f51e6b..4ba1cd8537 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ /* * Copyright 1996 The XFree86 Project diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index cda56e327f..7571ce3ca9 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index c9ef93a1be..b7a177521f 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index ab6cb9a243..3eab6d46a1 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index c3db7ff57a..b7ee997e3b 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 5237e8b2c1..186711e3f6 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 1b1bc18303..7233e215cb 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 2084e8d616..3149acf5c4 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 3709210024..8afd479b73 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 234d242c49..514a8cf428 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index e1c57588a5..914631b58d 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 0fb1db365c..b50b31bb01 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index e08284879a..16691a951b 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 5cce3e7ed9..eb20ea8ddc 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ #include "misc.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index c7756ba93d..25f8bd4867 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 30f35aab58..e67c99a392 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index ce72d742c0..af33802315 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 4075bab6af..70a7b1d7d0 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index fe8d70de2e..999d7177d4 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 5222256650..356774c290 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index b27a54e81d..56cd9e3c40 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 862f50ba03..8b111d1cf2 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ #include "xaa.h" #include "xaalocal.h" diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 845dccd4ea..0fd5726171 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaTEGlyphBlt.S b/hw/xfree86/xaa/xaaTEGlyphBlt.S index f5c580760f..5f3137f45f 100644 --- a/hw/xfree86/xaa/xaaTEGlyphBlt.S +++ b/hw/xfree86/xaa/xaaTEGlyphBlt.S @@ -21,7 +21,7 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.1 1999/07/10 07:24:54 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 82fa286744..49089afb3b 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index 0d2ce760ad..6c16f11d35 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */ /* * This is a table of 24-bit values, indexed with an 8-bit byte value, then diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index f999b425f3..fedd8f44d7 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 276f016722..933d8f7333 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ #include "Xarch.h" diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 4504deffd7..04d8d154a8 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 8fee075339..048ed00fca 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */ +/* $XFree86$ */ /* diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index e6963c3254..59f0a2cc7e 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */ #define XAA_SCREEN_PROLOGUE(pScreen, field)\ ((pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index e72fa43169..a293324973 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh index a8f43eceb5..5140407762 100644 --- a/hw/xfree86/xf1bpp/mfbmap.sh +++ b/hw/xfree86/xf1bpp/mfbmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.1.2.3 1998/06/27 14:48:23 dawes Exp $ # # This script recreates the mapping list that maps the mfb external # symbols * to xf1bpp* (without "mfb") diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 94c0298560..0134872e09 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh index 6b244e68e5..44dc781fc3 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.sh +++ b/hw/xfree86/xf1bpp/mfbunmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ # # This script recreates a header that undoes the effect of mfbmap.h # This should only be rerun if there have been changes in the mfb code diff --git a/hw/xfree86/xf4bpp/NOTES b/hw/xfree86/xf4bpp/NOTES index f9ccc95c11..e3b77dcfdd 100644 --- a/hw/xfree86/xf4bpp/NOTES +++ b/hw/xfree86/xf4bpp/NOTES @@ -191,4 +191,4 @@ MORE NOTES: -$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.2 1998/07/25 16:59:26 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.1.2.2 1998/06/27 15:15:45 dawes Exp $ diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 3891f1e21a..9b5ea57ead 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index e9ac98dc90..4a347b5d11 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index 42f118aac4..a7f1156825 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index 650c448b80..1e2d095eef 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index f99ce33e0f..15231a653b 100644 --- a/hw/xfree86/xf4bpp/ibmTrace.h +++ b/hw/xfree86/xf4bpp/ibmTrace.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index 3002560211..82b17e59e1 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index 5609959577..29b816a3ab 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index 4c4d8eab63..5d677174de 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index 3d6c3df52d..c53edd19d6 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index a5d5b5b37e..b4f5bd0142 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index c2717599f8..b200a611e8 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 7ca32d903a..106fc6ae54 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */ /************************************************************ diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index 1d118863fb..e684bf118c 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 40e9d5b327..0d1a2075b3 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index a1f49a486d..295f521590 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index a68f5faff2..aef3c2dd57 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index cd307fe942..87b3871765 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index 86b7d6f6c4..c6df4ef410 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 919fa0133b..5c3aff6f63 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index af1ecb95e8..ec9032e574 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index df8ae335f2..bbc64c97cb 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 341e17534a..78273ca236 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index b6c404e80d..00cd985a7d 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index f6999c561e..02019b19ac 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */ /* Copyright (c) 1990 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 275db433aa..948359a308 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index c009d696ee..66b547e594 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 2317fbdfa6..c3085bc4b2 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index f52343fc91..65ff055d2f 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index d080a623ff..736d128c69 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 754eb37327..8bb43eea44 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 57d5fcff85..267eef0efb 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index 5d33bc3c9c..47e4277553 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 81294b2cc2..9c3464de1d 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index 7ea244f66c..bc56ca1fc9 100644 --- a/hw/xfree86/xf4bpp/ppcSpMcro.h +++ b/hw/xfree86/xf4bpp/ppcSpMcro.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index fc38cdcfee..ff59fccffb 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index 1de8d68ee7..a1c7afd9d2 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index 660cc356b7..dc7b7965a8 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* GJA -- span move routines */ diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index 867e2c50ea..39597d268a 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index 4357e4d8a0..a03f21d2b2 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index 43f59d9389..a3596e6a31 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index b3711f8525..6cd15e9f59 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index f5ace74d03..316b4a49b2 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index ecc2fa738d..345492c593 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index 3509ce77f5..f3acf8123a 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 5fd303d7db..1c7261eb9a 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 59458a2589..976f27e32d 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ #ifndef __XF4BPP_H__ diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index b7fa9fd002..a4a3bda222 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.2 1999/03/28 15:33:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ #ifndef _CFB8_16_H #define _CFB8_16_H diff --git a/hw/xfree86/xf8_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c index d0d1974e76..b2b126d956 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16module.c +++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ +/* $XFree86$ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index 5e19fb7a20..cb4b8d7261 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -4,7 +4,7 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index 757b0dc49a..277abafc8d 100644 --- a/hw/xfree86/xf8_16bpp/cfbwindow.c +++ b/hw/xfree86/xf8_16bpp/cfbwindow.c @@ -4,7 +4,7 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index 30bc1a0faf..98a50f810b 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ #ifndef _CFB8_32_H #define _CFB8_32_H diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c index 9ed6b20186..2c8f203f8b 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32module.c +++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 581efb4f6c..3ebddd2d26 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 #include "cfb.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 53af8f7d85..2bfda9f6f2 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index 248ca0869c..b08288f19e 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index 6c13ca721a..f55aeb86c8 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index d8a6f4608a..635861bb56 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index d01b2b5cb9..19f9055e3e 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index e737e025e2..0510ae3c5e 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 6ea5fa3fac..f9fc2e35f2 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 7f123d36aa..93323d4875 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index c18b543991..3576a41c34 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 998503c21f..2268352496 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */ /* Copyright (C) 1998. The XFree86 Project Inc. diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h index 9913c2a6c8..2168054d92 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #ifndef _CFB8_32WID_H #define _CFB8_32WID_H diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c index 5a47b9ff55..83b6118bb3 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c +++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index 93c15371d3..8f307034f5 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -7,7 +7,7 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index 0aa8941763..b16266e934 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index b7ac739b3a..b11f05f1dd 100644 --- a/hw/xfree86/xf8_32wid/cfbwindow.c +++ b/hw/xfree86/xf8_32wid/cfbwindow.c @@ -7,7 +7,7 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 488179d018..0da0d50069 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index dc2ac9de0e..a0c586bcb2 100644 --- a/hw/xnest/Args.h +++ b/hw/xnest/Args.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTARGC_H #define XNESTARGS_H diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index ae5ded5e32..bcebc10cdd 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index 0b3c225811..9ce72a946e 100644 --- a/hw/xnest/Color.h +++ b/hw/xnest/Color.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTCOLOR_H #define XNESTCOLOR_H diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 52ba867cf6..146e7ebd0a 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 1a87030639..301ab139aa 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */ #include diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index 044f8f1316..78df26969e 100644 --- a/hw/xnest/Display.h +++ b/hw/xnest/Display.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.6 2001/01/17 22:36:55 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 6f52b286b1..7b96bdfee3 100644 --- a/hw/xnest/Drawable.h +++ b/hw/xnest/Drawable.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86$ */ #ifndef XNESTDRAWABLE_H #define XNESTDRAWABLE_H diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 1b7b3935f0..a36e0d8e81 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index ed0fbb8304..9ed211cb8c 100644 --- a/hw/xnest/Events.h +++ b/hw/xnest/Events.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTEVENTS_H #define XNESTEVENTS_H diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index f708488549..a0256c313a 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xatom.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 972849d9aa..7141e9cb9b 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index b43695c968..042a29f6ed 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index 722dde470d..ccdc40ebe1 100644 --- a/hw/xnest/GCOps.h +++ b/hw/xnest/GCOps.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTGCOPS_H #define XNESTGCOPS_H diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c index 3db9b85963..1ffc547646 100644 --- a/hw/xnest/GetTime.c +++ b/hw/xnest/GetTime.c @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xos.h" diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 693c7296b0..5344e4e506 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index ae92352d12..9a1e809cc8 100644 --- a/hw/xnest/Handlers.h +++ b/hw/xnest/Handlers.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTHANDLERS_H #define XNESTHANDLERS_H diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 6b3c4f19f1..7a43b62b4b 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.25 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index eb92918783..bda0780233 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index 5f8dc3cb40..4802318605 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTKEYBOARD_H #define XNESTKEYBOARD_H diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index b82dfa49be..5a92dc2717 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 1af5f02ec4..853a48955f 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 0b06e50214..27a2011b8c 100644 --- a/hw/xnest/Pointer.h +++ b/hw/xnest/Pointer.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTPOINTER_H #define XNESTPOINTER_H diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 6868845550..3412edfb86 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index 96260435b0..f35a2872d7 100644 --- a/hw/xnest/Screen.h +++ b/hw/xnest/Screen.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTSCREEN_H #define XNESTSCREEN_H diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c index f153b5b2c9..d7006207ae 100644 --- a/hw/xnest/TestExt.c +++ b/hw/xnest/TestExt.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */ #include #include diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index bcf7881eb5..f88e587b9d 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index 14e0085dcb..dfa74dbdce 100644 --- a/hw/xnest/Visual.h +++ b/hw/xnest/Visual.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTVISUAL_H #define XNESTVISUAL_H diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 14ddac0821..f7e04844e2 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index 7d9426d72e..b396c80b53 100644 --- a/hw/xnest/XNCursor.h +++ b/hw/xnest/XNCursor.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.2 2002/11/23 19:27:50 tsi Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 34d236f3b9..7fb4017bd4 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTFONT_H diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index bbec67120d..56939cceb7 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef XNESTGC_H #define XNESTGC_H diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index 4e4d9c40c0..fab1843d1f 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index 8b5f39115d..cc49b23434 100644 --- a/hw/xnest/XNWindow.h +++ b/hw/xnest/XNWindow.h @@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.3 2003/11/03 05:36:34 tsi Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index 64b09de7e9..ade73833f4 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */ +/* $XFree86$ */ /* ** Machines with a 64 bit library interface and a 32 bit server require diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/Xnest.man.pre index 4884891895..131c224f2d 100644 --- a/hw/xnest/Xnest.man.pre +++ b/hw/xnest/Xnest.man.pre @@ -25,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.7 2003/10/24 17:22:33 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $ .\" .TH XNEST 1 __xorgversion__ .SH NAME diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 15282d206f..2e3b7b3997 100644 --- a/hw/xnest/os2Stub.c +++ b/hw/xnest/os2Stub.c @@ -26,7 +26,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.1 2002/05/31 18:46:04 dawes Exp $ */ /* This below implements select() for calls in xnest. It has been */ /* somewhat optimized for improved performance, but assumes a few */ diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index de84a7aeee..92fb5c3e56 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -26,7 +26,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */ #include "win.h" #include "../../Xext/xf86miscproc.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 3202ae8d94..13381ffa1d 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.35 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */ #include "win.h" #include "winconfig.h" diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man index fe78047c46..8a185f1cab 100644 --- a/hw/xwin/XWin.man +++ b/hw/xwin/XWin.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.7 2003/10/02 13:30:09 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.5 2002/07/05 09:19:25 alanh Exp $ .TH XWIN 1 __vendorversion__ .SH NAME XWin \- X Server for the Cygwin environment on Microsoft Windows diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc index 7b5708af23..c918304afc 100644 --- a/hw/xwin/XWin.rc +++ b/hw/xwin/XWin.rc @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.1 2002/10/17 08:18:21 alanh Exp $ */ #include "resource.h" diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index b67a556b52..2ca4f34627 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xwin/ddraw.h,v 1.4 2001/07/29 22:08:15 tsi Exp $ */ +/* $XFree86$ */ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 6ecf5ada06..53d0880ea2 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.37 2003/10/02 13:30:09 eich Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index a273095987..0da1365415 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -28,7 +28,7 @@ * Authors: Keith Packard, MIT X Consortium * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.12 2002/10/31 23:04:39 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index cc057eed69..35463493ba 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.5 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c index a829e8eb9b..b8d10365d6 100644 --- a/hw/xwin/winclip.c +++ b/hw/xwin/winclip.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.1 2001/04/05 20:13:49 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h index 8f9bae7891..3e7c22fa06 100644 --- a/hw/xwin/winclipboard.h +++ b/hw/xwin/winclipboard.h @@ -27,7 +27,7 @@ * * Authors: Harold Hunt */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #ifndef _WINCLIPBOARD_H_ diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c index a1f7b0b6d9..0a19777595 100644 --- a/hw/xwin/winclipboardinit.c +++ b/hw/xwin/winclipboardinit.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardinit.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c index 09ef400764..2f11b9241e 100644 --- a/hw/xwin/winclipboardtextconv.c +++ b/hw/xwin/winclipboardtextconv.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardtextconv.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" #include diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c index 06a9855334..7a746a0b3d 100644 --- a/hw/xwin/winclipboardthread.c +++ b/hw/xwin/winclipboardthread.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c index 9eb2b0d87a..bda09b79f7 100644 --- a/hw/xwin/winclipboardunicode.c +++ b/hw/xwin/winclipboardunicode.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c index c577d060e4..f8e52a0ef7 100644 --- a/hw/xwin/winclipboardwndproc.c +++ b/hw/xwin/winclipboardwndproc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c index 8b3a564894..d2cfb2e557 100644 --- a/hw/xwin/winclipboardxevents.c +++ b/hw/xwin/winclipboardxevents.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index 4fb89a2fdd..f89c26cf09 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.10 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index b42b1d6bfd..db69005fd0 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "winconfig.h" diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h index d3099b373a..22db4abee0 100644 --- a/hw/xwin/winconfig.h +++ b/hw/xwin/winconfig.h @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86$ */ #ifndef __WIN_CONFIG_H__ #define __WIN_CONFIG_H__ diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 336131c8a7..10d2273cde 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.7 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.4 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" #include "shellapi.h" diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index e7c3ba7e7b..9e053a7d24 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.6 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index d905ad81c5..07db55075f 100755 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/windialogs.c,v 1.1 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: $ */ #include "win.h" diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index d76e586288..c8c2ef40f7 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.5 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.3 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 8a1e0df85f..fa6687c1b9 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.6 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.3 2001/10/23 22:22:47 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 9ac5362749..556fde718a 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.10 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c index 97bd7967b8..a6ff2f7da0 100644 --- a/hw/xwin/winfont.c +++ b/hw/xwin/winfont.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.3 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c index a4e2a53cb7..ce0ef65844 100644 --- a/hw/xwin/wingc.c +++ b/hw/xwin/wingc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.10 2001/10/30 15:39:09 alanh Exp $ */ #include "win.h" void diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index 49ba7f2fb2..79dc5eb531 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 95f245e573..4228ad4223 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index 0822b0e5fb..9a4a3f68f0 100644 --- a/hw/xwin/winkeybd.h +++ b/hw/xwin/winkeybd.h @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.1 2001/09/26 13:00:34 alanh Exp $ */ /* * We need symbols for the scan codes of keys. diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c index ea8303ea9d..e93d1fd934 100644 --- a/hw/xwin/winmisc.c +++ b/hw/xwin/winmisc.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.6 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 8c9439bfdf..ef3a2eb92a 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.4 2001/10/29 21:10:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index 17454487db..ad20348b6b 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.2 2001/04/18 17:14:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.1 2001/04/05 20:13:50 dawes Exp $ */ #ifndef _WINMS_H_ #define _WINMS_H_ diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index ce8ac41991..8d42d95a0c 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 16ec536b00..136cdc3a8f 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ #ifndef __WIN_MSG_H__ #define __WIN_MSG_H__ diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index 21be64977d..be65bd153a 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ #include #include "propertyst.h" diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h index b6ad55d8bb..f9cfee30f8 100755 --- a/hw/xwin/winmultiwindowclass.h +++ b/hw/xwin/winmultiwindowclass.h @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86$ */ /* diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index dd56db6d66..33b9391a87 100755 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowicons.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c index 2d6a6f2cc5..a21bbe9f3e 100755 --- a/hw/xwin/winmultiwindowshape.c +++ b/hw/xwin/winmultiwindowshape.c @@ -28,7 +28,7 @@ * Authors: Kensuke Matsuzaki * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ #ifdef SHAPE diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 15e508659d..1430b7d884 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -29,7 +29,7 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index a60d36135e..f77a404769 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -27,7 +27,7 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v 1.3 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* X headers */ #include diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index d90abb61f9..83f3b02f68 100755 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -29,7 +29,7 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.3 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index f7d8a4a1a8..b2ac9f14e5 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.15 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index 7cbdb5e53f..33cb42eb1c 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.18 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 43ade059b9..24e49719a9 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -28,7 +28,7 @@ * Authors: drewry, september 1986 * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c index d28929d67a..46d7382091 100644 --- a/hw/xwin/winpntwin.c +++ b/hw/xwin/winpntwin.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.1 2001/04/05 20:13:50 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c index 948c34428c..baafd8c393 100644 --- a/hw/xwin/winpolyline.c +++ b/hw/xwin/winpolyline.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.4 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.3 2001/09/13 08:25:45 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index 3bea60d3de..b0a5d49eef 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.c,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include #include diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index ae1cb07d84..4ae01c0815 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.h,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ /* Need to know how long paths can be... */ #include diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l index 8eda8e6c26..9601834984 100644 --- a/hw/xwin/winprefslex.l +++ b/hw/xwin/winprefslex.l @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefslex.l,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include #include diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index a6ffc72079..5ae33b67e9 100644 --- a/hw/xwin/winprefsyacc.y +++ b/hw/xwin/winprefsyacc.y @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winprefsyacc.y,v 1.1 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include #include diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index deb9629d72..2ae0e65573 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c index b31fcf641f..7d4a473abf 100644 --- a/hw/xwin/winregistry.c +++ b/hw/xwin/winregistry.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winregistry.c,v 1.1 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c index c5ec45de54..76a997aaa6 100644 --- a/hw/xwin/winrop.c +++ b/hw/xwin/winrop.c @@ -27,7 +27,7 @@ * * Authors: Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winrop.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86$ */ /* * Raster operations used by Windows translated to X's 16 rop codes... diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 79e985c6bc..595f3da7e9 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index c0340e47b6..87a16fc31a 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index a409c27c64..2c202a01c4 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.24 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index e902f31b09..a5e09421e7 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 16b1969d7a..29ce6761b7 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.23 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.21 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index 90c77b1c83..e7d611f812 100755 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -28,7 +28,7 @@ * Authors: Early Ehlinger * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wintrayicon.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: $ */ #include "win.h" #include diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c index 8bf12cd66b..e2eb7abfb7 100755 --- a/hw/xwin/winvideo.c +++ b/hw/xwin/winvideo.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.1tsi Exp $ */ #include "win.h" #include "Xv.h" diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index f311d0dc9d..55658ecac4 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.7 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 76dfc5d897..378465bc45 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.10 2003/12/22 01:34:20 dickey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */ #include "win.h" diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 8153b56002..963caafdf2 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -27,7 +27,7 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.3 2003/10/02 13:30:11 eich Exp $ */ #ifndef _WINWINDOW_H_ diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 5b47a212a7..535882753f 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -31,7 +31,7 @@ * Harold L Hunt II * MATSUZAKI Kensuke */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #include "win.h" #include diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h index cb4ee6be41..7e015ebc42 100644 --- a/ilbm/ilbm.h +++ b/ilbm/ilbm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.2 1998/04/05 16:42:23 robin Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c index b148bc00c9..f861b93e9b 100644 --- a/ilbm/ilbmbitblt.c +++ b/ilbm/ilbmbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.2tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c index 455c07cb56..286a824744 100644 --- a/ilbm/ilbmblt.c +++ b/ilbm/ilbmblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */ +/* $XFree86$ */ /* * ilbm copy area */ diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index 4204c61b54..931da54fd2 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index 75391e96b7..1cd456bb1d 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c index 8309e26003..2a12a39bcc 100644 --- a/ilbm/ilbmbstore.c +++ b/ilbm/ilbmbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c index 4628e61d01..72d143e18d 100644 --- a/ilbm/ilbmclip.c +++ b/ilbm/ilbmclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c index 10dadd9688..06da361e26 100644 --- a/ilbm/ilbmcmap.c +++ b/ilbm/ilbmcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.0 1996/08/18 01:53:46 dawes Exp $ */ /* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c index f107e4692c..28f2df91da 100644 --- a/ilbm/ilbmfillarc.c +++ b/ilbm/ilbmfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.0 1996/08/18 01:53:48 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c index 642a95f40e..4c2507487a 100644 --- a/ilbm/ilbmfillrct.c +++ b/ilbm/ilbmfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.0 1996/08/18 01:53:49 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c index 5564e51424..f7fe907438 100644 --- a/ilbm/ilbmfillsp.c +++ b/ilbm/ilbmfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.0 1996/08/18 01:53:50 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c index 50cf56773e..05e89bd8d1 100644 --- a/ilbm/ilbmfont.c +++ b/ilbm/ilbmfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */ +/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c index 8253d9cd42..259935c46b 100644 --- a/ilbm/ilbmgc.c +++ b/ilbm/ilbmgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.0 1996/08/18 01:53:52 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index 727bafd397..e6adbae4a2 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c index fe26381676..277ac722a9 100644 --- a/ilbm/ilbmhrzvert.c +++ b/ilbm/ilbmhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c index d2f7a4df9e..348d593a35 100644 --- a/ilbm/ilbmimage.c +++ b/ilbm/ilbmimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */ #include /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c index 1bd6f02f95..24143fba32 100644 --- a/ilbm/ilbmimggblt.c +++ b/ilbm/ilbmimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.0 1996/08/18 01:53:57 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c index d831489c5a..49dd7da467 100644 --- a/ilbm/ilbmline.c +++ b/ilbm/ilbmline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.0 1996/08/18 01:53:58 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index d85346acad..9717aceca1 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c index ab5a33f2ab..01b9918922 100644 --- a/ilbm/ilbmpixmap.c +++ b/ilbm/ilbmpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c index b76a29892c..41d4545e4f 100644 --- a/ilbm/ilbmply1rct.c +++ b/ilbm/ilbmply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.0 1996/08/18 01:54:02 dawes Exp $ */ /* * $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c index a7dca57563..fdd0a071fb 100644 --- a/ilbm/ilbmplygblt.c +++ b/ilbm/ilbmplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.0 1996/08/18 01:54:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c index 0199b0bc6f..497eb50ee9 100644 --- a/ilbm/ilbmpntarea.c +++ b/ilbm/ilbmpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c index 5cc29e331a..787955a879 100644 --- a/ilbm/ilbmpntwin.c +++ b/ilbm/ilbmpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c index f313dc8d11..e35b85416c 100644 --- a/ilbm/ilbmpolypnt.c +++ b/ilbm/ilbmpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.0 1996/08/18 01:54:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c index 6a045d2426..5bedef8515 100644 --- a/ilbm/ilbmpushpxl.c +++ b/ilbm/ilbmpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.0 1996/08/18 01:54:08 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c index 5a6fa71a0b..f8b4eb52df 100644 --- a/ilbm/ilbmscrinit.c +++ b/ilbm/ilbmscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.4 1998/07/26 01:53:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index a18cf53f8e..55073817d0 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.0 1996/08/18 01:54:10 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c index dc42baee9d..2c39ef7a93 100644 --- a/ilbm/ilbmtegblt.c +++ b/ilbm/ilbmtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.0 1996/08/18 01:54:11 dawes Exp $ */ /* $XConsortium: ilbmtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c index e289144ef8..d6e8154056 100644 --- a/ilbm/ilbmtile.c +++ b/ilbm/ilbmtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */ +/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c index 5249729440..fbf543de45 100644 --- a/ilbm/ilbmwindow.c +++ b/ilbm/ilbmwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ilbmwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c index 9bdf221550..9ac30e267b 100644 --- a/ilbm/ilbmzerarc.c +++ b/ilbm/ilbmzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.0 1996/08/18 01:54:15 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/include/XIstubs.h b/include/XIstubs.h index ad36bc7164..e005493c49 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/bstore.h b/include/bstore.h index c3a6a9f38c..098abcd866 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/bstorestr.h b/include/bstorestr.h index 694841ed06..8f21855c4f 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/closestr.h b/include/closestr.h index 34d5931f29..fcd64ed456 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */ #ifndef CLOSESTR_H diff --git a/include/colormap.h b/include/colormap.h index f249f4f03e..e8b2355295 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group diff --git a/include/cursor.h b/include/cursor.h index 69e8ed731e..fdc1f3c3e5 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,5 +1,5 @@ /* $XdotOrg$ */ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/cursorstr.h b/include/cursorstr.h index 0e2f04a6de..3984245adf 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */ #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index a47bfd8cc7..0ca157ad4f 100644 --- a/include/dix.h +++ b/include/dix.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/dixevents.h b/include/dixevents.h index f80f3ab0bf..46a5faef0f 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixfont.h b/include/dixfont.h index 2a6877de2d..d3bb69b0a1 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 21992e7867..042e063db1 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixstruct.h b/include/dixstruct.h index 43920540f6..9c39a8aec5 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/include/exevents.h b/include/exevents.h index ea3804bd33..91c7acb6b8 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extension.h b/include/extension.h index 6b674f07f6..34750173bb 100644 --- a/include/extension.h +++ b/include/extension.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 107eee8910..37fa9a2454 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extnsionst.h b/include/extnsionst.h index 0d7debe0b5..daf37bf43f 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index a886d77b88..2288e8491c 100644 --- a/include/gc.h +++ b/include/gc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/gcstruct.h b/include/gcstruct.h index 43cc679b47..6feff51f55 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index be3a2b0711..63372f715f 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index acf3bca1a4..fa88febdac 100644 --- a/include/input.h +++ b/include/input.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */ #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index a8a8348071..70627629ba 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/include/misc.h b/include/misc.h index ffa65b31e1..5944a427fd 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/miscstruct.h b/include/miscstruct.h index 86f1147921..f0ff25b281 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */ #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index b5a55a60b6..09a3570f94 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */ #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/os.h b/include/os.h index e9328c8fa9..4d45b571f4 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/os.h,v 3.53 2003/10/29 04:17:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/pixmap.h b/include/pixmap.h index 56bb675aee..6cea329ece 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index d5bc212730..1b0df9fd37 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86$ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H diff --git a/include/property.h b/include/property.h index 66103bc8ed..21a38d51c3 100644 --- a/include/property.h +++ b/include/property.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */ #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index 5c335d0384..177fca1716 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */ #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H diff --git a/include/regionstr.h b/include/regionstr.h index b7a05eaca0..192983dab6 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */ #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H diff --git a/include/resource.h b/include/resource.h index 6517ab2128..49c1898694 100644 --- a/include/resource.h +++ b/include/resource.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 diff --git a/include/screenint.h b/include/screenint.h index 988a7416c8..b3e76c4c21 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 0f1813c007..edd14c12f0 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/servermd.h b/include/servermd.h index 654e1411b4..6c72081170 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/site.h b/include/site.h index 1c272fc3f4..be8c003da3 100644 --- a/include/site.h +++ b/include/site.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */ #ifndef SITE_H #define SITE_H diff --git a/include/swaprep.h b/include/swaprep.h index b6671e7d94..2c026c6595 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/swapreq.h b/include/swapreq.h index 59ba8c5be8..9c59bbf843 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/validate.h b/include/validate.h index 2a13962a7a..467533d223 100644 --- a/include/validate.h +++ b/include/validate.h @@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */ #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index 0c886559ec..5056512b84 100644 --- a/include/window.h +++ b/include/window.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 2dce443d37..8e8d2542a8 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */ #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index bdc1682f5a..cc4e519ce6 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.5 2001/01/30 22:06:21 tsi Exp $ */ /* $XConsortium: ipl.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c index 57b8fce573..11e3589447 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */ +/* $XFree86$ */ /* * $XConsortium: iplallpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $ * diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c index 27470382b8..9105faa485 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.1tsi Exp $ */ /* * ipl copy area */ diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index 8a48bd9da4..f303859cd7 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */ +/* $XFree86$ */ /* * ipl copy area */ diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index 9d2b571db0..47b895ea4a 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index 7cc93e90c2..dd096dfbd5 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 5719ca3080..422d102919 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */ +/* $XFree86$ */ /*- * iplbstore.c -- diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index 21abfdbb31..3b73b1481e 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.0 1996/08/18 01:54:40 dawes Exp $ */ /* $XConsortium: iplcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c index c77db6b63f..50e4a81ab2 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */ +/* $XFree86$ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 512c480480..7af2fa4fa1 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.0 1996/08/18 01:54:42 dawes Exp $ */ /* * Fill rectangles. */ diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 010f911f65..767db30cbf 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */ +/* $XFree86$ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 794a62609b..8a69cb7c8b 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.0 1996/08/18 01:54:45 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 271656bda0..8ae61b6cc9 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c index 6374e4d195..1bcb57d576 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 0522309b4d..6c8e9ab73f 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index 479bfb00a2..f596386939 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.0 1996/08/18 01:54:50 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h index 2e0a2b3cc1..b188ec3ecf 100644 --- a/iplan2p4/iplmap.h +++ b/iplan2p4/iplmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.1 1998/04/05 16:42:26 robin Exp $ */ /* * $XConsortium: iplmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $ * diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h index fa537d3a70..22f3b4d5ff 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */ #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c index 9f1d37dfb8..d408b804e0 100644 --- a/iplan2p4/iplmskbits.c +++ b/iplan2p4/iplmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.c,v 3.0 1996/08/18 01:54:54 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ #include "iplmap.h" diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h index 4fb3fe0669..51bb263934 100644 --- a/iplan2p4/iplmskbits.h +++ b/iplan2p4/iplmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.h,v 3.0 1996/08/18 01:54:55 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpack.c b/iplan2p4/iplpack.c index 96072895c9..a6ca6f12b8 100644 --- a/iplan2p4/iplpack.c +++ b/iplan2p4/iplpack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.c,v 3.0 1996/08/18 01:54:56 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpack.h b/iplan2p4/iplpack.h index 9545c75ec7..53c2c988fc 100644 --- a/iplan2p4/iplpack.h +++ b/iplan2p4/iplpack.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.h,v 3.0 1996/08/18 01:54:57 dawes Exp $ */ +/* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c index 212f94979a..7800e8d96e 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.0 1996/08/18 01:54:59 dawes Exp $ */ /* $XConsortium: iplpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c index f73bc8864f..fc73f2065e 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.0 1996/08/18 01:55:00 dawes Exp $ */ /* * $XConsortium: iplply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $ * diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c index a5a61194a7..88dbad6bf7 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c index 3d90edea41..763733a04f 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.0 1996/08/18 01:55:02 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index cfc43c130e..75ec557ee7 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */ +/* $XFree86$ */ /* * $XConsortium: iplrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $ * diff --git a/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h index d14d1a54be..31e7b79b1e 100644 --- a/iplan2p4/iplrrop.h +++ b/iplan2p4/iplrrop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.0 1996/08/18 01:55:04 dawes Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c index 1d79157765..00dbef0749 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.2 1998/06/27 12:55:03 hohndel Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 0533eed71d..52eefc31d2 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: iplsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c index 2f741ed7f6..447193b272 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.0 1996/08/18 01:55:08 dawes Exp $ */ /* * $XConsortium: iplsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $ * diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c index 4d82a655ab..8414bc7b26 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */ +/* $XFree86$ */ /* $XConsortium: ipltegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */ /*********************************************************** diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c index ea608effb3..6774de8340 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.0 1996/08/18 01:55:10 dawes Exp $ */ /* * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c index a63ce5da67..abd4a30214 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */ +/* $XFree86$ */ /* * Fill odd tiled rectangles and spans. * no depth dependencies. diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index 39d1eff9b6..8d95e284bd 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.0tsi Exp $ */ /* $XConsortium: iplwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */ /*********************************************************** diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c index 25ef344267..b1366aa3fa 100644 --- a/lbx/lbxcmap.c +++ b/lbx/lbxcmap.c @@ -25,7 +25,7 @@ not be 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/programs/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index 5a40614f61..c392e6415e 100644 --- a/lbx/lbxdix.c +++ b/lbx/lbxdix.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.7 2001/08/23 14:46:57 alanh Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index d611a7f2c6..7ae70ebde8 100644 --- a/lbx/lbxexts.c +++ b/lbx/lbxexts.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index 6eb7af1970..5a468ecbf6 100644 --- a/lbx/lbxgfx.c +++ b/lbx/lbxgfx.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.3 2001/01/17 22:36:59 dawes Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index 1a82ce3b3e..443bb04141 100644 --- a/lbx/lbxmain.c +++ b/lbx/lbxmain.c @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index 461f0d7783..fdef2db7c4 100644 --- a/lbx/lbxopts.c +++ b/lbx/lbxopts.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */ #ifdef OPTDEBUG #include diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index e9a6d8a8ee..9082250d67 100644 --- a/lbx/lbxprop.c +++ b/lbx/lbxprop.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.4 2001/05/15 10:19:43 eich Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h index 40a2ff0ae9..eeff648042 100644 --- a/lbx/lbxserve.h +++ b/lbx/lbxserve.h @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */ #ifndef _LBXSERVE_H_ diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index d716470910..f3dc131637 100644 --- a/lbx/lbxsquish.c +++ b/lbx/lbxsquish.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include "X.h" diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h index eeb94f2660..ea7f2420e5 100644 --- a/lbx/lbxsrvopts.h +++ b/lbx/lbxsrvopts.h @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index edfc0bea7b..23fdd30f7c 100644 --- a/lbx/lbxswap.c +++ b/lbx/lbxswap.c @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c index e071846e3e..26a635f6f9 100644 --- a/lbx/lbxtables.c +++ b/lbx/lbxtables.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ #include "dix.h" extern int ProcInitialConnection(ClientPtr client); diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 5b1d65a4a6..6fdc4d5a21 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h index e451ad091a..376a4cc273 100644 --- a/lbx/lbxtags.h +++ b/lbx/lbxtags.h @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c index 50b4247080..20d58b37be 100644 --- a/lbx/lbxzerorep.c +++ b/lbx/lbxzerorep.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ /* * This module handles zeroing out unused pad bytes in core X replies. diff --git a/mfb/fastblt.h b/mfb/fastblt.h index f647eb6bae..f25541f551 100644 --- a/mfb/fastblt.h +++ b/mfb/fastblt.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.4 2001/01/17 22:37:01 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing diff --git a/mfb/maskbits.c b/mfb/maskbits.c index 4f3e0087b8..09f593ec2a 100644 --- a/mfb/maskbits.c +++ b/mfb/maskbits.c @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ #include "maskbits.h" #include "servermd.h" diff --git a/mfb/maskbits.h b/mfb/maskbits.h index 7117316609..4cd30be39d 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.8tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/mfb/mergerop.h b/mfb/mergerop.h index ee3a33fe94..e54e1f9060 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ #ifndef _MERGEROP_H_ #define _MERGEROP_H_ diff --git a/mfb/mfb.h b/mfb/mfb.h index 01e09f195e..267ebc4eae 100644 --- a/mfb/mfb.h +++ b/mfb/mfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.21 2003/07/16 03:35:16 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 310d492f84..6e950e8370 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.7tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index 59968110b1..ca240ba991 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -1,7 +1,7 @@ /* * mfb copy area */ -/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.3 2001/10/28 03:34:14 tsi Exp $ */ /* diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index d43bd2e009..b1fad2192d 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -1,5 +1,5 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ -/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index 182744d6ed..a7ffdc36c9 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index d23071cd3f..3b36819ef3 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index d5dfbf47fe..253399df47 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.7tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 886c2852a4..9e65d83400 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index cd1b668459..aa90f411bd 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 5a095757f0..8fd4c0f292 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 1119f66f9e..aec4c2e7fb 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.9 2003/07/16 01:38:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index 59bd7e5385..b63a184f80 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.3tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 237e337f50..626ef67fb4 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 4d616ed8b0..1fb40db5aa 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 066ca3ce76..aa948a34e6 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbline.c b/mfb/mfbline.c index e7e6789830..b8e1d36481 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 980e57246b..f3f8decc76 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ #include "X.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 61a7297f04..5e4a619bed 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index 38cd4aee88..5c99d03deb 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index f10e390463..0410af192c 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.6tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 28b0c24c39..12ccf60793 100644 --- a/mfb/mfbscrclse.c +++ b/mfb/mfbscrclse.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */ #include "mfb.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index d07aadb80d..c85d4e36b0 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.8tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index a56935dbea..66da37d1d5 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.6tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index 1e0da0f021..b0e02850c8 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index e672f38c9d..50b261114d 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index f7ff963c4b..294083f787 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86$ */ #include "X.h" #include "scrnintstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 1ef9f1f565..ad46732ab8 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/cbrt.c b/mi/cbrt.c index 44c836e430..cfc8d84dae 100644 --- a/mi/cbrt.c +++ b/mi/cbrt.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.3 2001/05/29 22:24:06 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ diff --git a/mi/mi.h b/mi/mi.h index fba57567dc..388a90b279 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/mi/miarc.c b/mi/miarc.c index 38bd998ee9..1c37551e30 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.3 2003/12/20 00:28:31 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mibank.c b/mi/mibank.c index 11708434c3..1f1087b88f 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -44,7 +44,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.16 2004/01/05 16:42:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.15 2003/11/10 18:39:16 tsi Exp $ */ /* * This thing originated from an idea of Edwin Goei and his bank switching diff --git a/mi/mibank.h b/mi/mibank.h index eac53db206..cf27d1fae6 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.11 2004/01/05 16:42:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */ #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibitblt.c b/mi/mibitblt.c index f0228212c7..82e34cdbeb 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mibstore.c b/mi/mibstore.c index e04e5410ca..1cd35c4dde 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -42,7 +42,7 @@ implied warranty. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/mi/mibstore.h b/mi/mibstore.h index e8f197dbc5..fb58975c6d 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -16,7 +16,7 @@ */ -/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index 249b4d4d31..fec3c9712c 100644 --- a/mi/mibstorest.h +++ b/mi/mibstorest.h @@ -31,7 +31,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/programs/Xserver/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #include "mibstore.h" #include "regionstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index 95272c1765..456ad08c40 100644 --- a/mi/miclipn.c +++ b/mi/miclipn.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/mi/micmap.c b/mi/micmap.c index b3e925a09f..018244a2a3 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.11 2001/05/29 22:24:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.10 2000/09/20 00:09:14 keithp Exp $ */ /* * This is based on cfbcmap.c. The functions here are useful independently diff --git a/mi/micmap.h b/mi/micmap.h index 557ae63d5f..ca2a417bed 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.7 2000/09/20 00:09:15 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ #include "colormapst.h" diff --git a/mi/micursor.c b/mi/micursor.c index 4c95d2f496..5da44c3518 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midash.c b/mi/midash.c index bc33b0c20d..0152db7ca0 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midispcur.c b/mi/midispcur.c index ca85fc3d10..08c9f92165 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */ #define NEED_EVENTS # include "X.h" diff --git a/mi/mieq.c b/mi/mieq.c index 699d4130ca..a0ed3fdcec 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.2 2001/05/25 18:41:01 dawes Exp $ */ /* * mieq.c diff --git a/mi/miexpose.c b/mi/miexpose.c index fc09698647..ecda2dcfe5 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mifillarc.c b/mi/mifillarc.c index fa37d45be1..c8b901c85b 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ed8503f15a..ff39bac1dc 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillrct.c b/mi/mifillrct.c index be2c58dfe7..31219869eb 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 837cf7b205..79f606b4d7 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 93999ea7d5..ae41cf6f68 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/migc.c b/mi/migc.c index 29eec97494..b5b33852a4 100644 --- a/mi/migc.c +++ b/mi/migc.c @@ -27,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/migc.h b/mi/migc.h index 8cb5a56c9a..d906c63344 100644 --- a/mi/migc.h +++ b/mi/migc.h @@ -27,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.8 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.7 2001/08/06 20:51:18 dawes Exp $ */ extern void miChangeGC( GCPtr /*pGC*/, diff --git a/mi/miglblt.c b/mi/miglblt.c index 3e7e5da1b2..f2a748db6d 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miinitext.c b/mi/miinitext.c index 764ec7901a..6c8c203072 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miline.h b/mi/miline.h index 8977550b3d..f52a51ebda 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -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/programs/Xserver/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MILINE_H diff --git a/mi/mioverlay.c b/mi/mioverlay.c index cdb2058b15..74cd18022d 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 6098f9c390..64045f45c1 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.4 2001/04/14 21:15:26 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ #ifndef __MIOVERLAY_H #define __MIOVERLAY_H diff --git a/mi/mipointer.c b/mi/mipointer.c index 58d93b80b7..2e4ee607bf 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */ # define NEED_EVENTS # include "X.h" diff --git a/mi/mipointer.h b/mi/mipointer.h index 0486fc5a3b..f8e7fd0844 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index ab53722295..682f8ac881 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index ad69d7062a..2c420b2503 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86$ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipoly.h b/mi/mipoly.h index 42d973477a..88a1782de8 100644 --- a/mi/mipoly.h +++ b/mi/mipoly.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /* diff --git a/mi/mipolycon.c b/mi/mipolycon.c index d99ed83d7d..de33045ef6 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolygen.c b/mi/mipolygen.c index bbeb05dc39..484a29798b 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index ed19f5f689..f88545cfd3 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 298ba23856..07964cf82f 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index cb6bb7550b..fe49939143 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolytext.c b/mi/mipolytext.c index 9084fe1800..a3f64a0867 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index 7ffeadd863..9a74222236 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.9 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 0c8d32ae66..019ba437e3 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miregion.c b/mi/miregion.c index ef666c321f..83a2319fd9 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.9 2003/04/23 21:51:53 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group diff --git a/mi/miscrinit.c b/mi/miscrinit.c index edb5f7d78c..7f8ee48ad0 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ #include "X.h" #include "servermd.h" diff --git a/mi/mispans.c b/mi/mispans.c index 81fa45da76..84a737525e 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/mispans.h b/mi/mispans.h index 5ae2d014ad..b6e97e2b4a 100644 --- a/mi/mispans.h +++ b/mi/mispans.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/misprite.c b/mi/misprite.c index d323f11684..260a4dac04 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */ # include "X.h" # include "Xproto.h" diff --git a/mi/misprite.h b/mi/misprite.h index a7e19f7cb5..b4cc84ecf0 100644 --- a/mi/misprite.h +++ b/mi/misprite.h @@ -32,7 +32,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( diff --git a/mi/mispritest.h b/mi/mispritest.h index eddc16c2d2..e438dd7d2f 100644 --- a/mi/mispritest.h +++ b/mi/mispritest.h @@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be 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/programs/Xserver/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ # include "misprite.h" #ifdef RENDER diff --git a/mi/mistruct.h b/mi/mistruct.h index 0744b25938..98879b72d4 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index c1ef15bb1c..c25e5d5bcb 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef MIVALIDATE_H diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 90ba5d98ef..d635175641 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.9tsi Exp $ */ /* * Aug '86: Susan Angebranndt -- original code diff --git a/mi/miwideline.c b/mi/miwideline.c index 84b4346f29..8888ca8bde 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwideline.h b/mi/miwideline.h index f32a1e8fe4..96d6aae861 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.11 2001/10/25 12:03:47 alanh Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 9c962ee4e0..4eac9226cb 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerarc.c b/mi/mizerarc.c index e2233e78e2..e36b2f3f0f 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerarc.h b/mi/mizerarc.h index 4a52efa299..99062d1924 100644 --- a/mi/mizerarc.h +++ b/mi/mizerarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerclip.c b/mi/mizerclip.c index fa1863b54b..304f525ae7 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerline.c b/mi/mizerline.c index d1fbf631ef..4672f6bd33 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/miext/layer/layer.h b/miext/layer/layer.h index 6304380576..09ab43540c 100644 --- a/miext/layer/layer.h +++ b/miext/layer/layer.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.5 2002/10/03 22:50:21 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c index 52490d286a..d01787b109 100644 --- a/miext/layer/layergc.c +++ b/miext/layer/layergc.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.5 2001/10/28 03:34:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.4 2001/08/27 03:55:46 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index 6cbca71509..4e49c9b15d 100644 --- a/miext/layer/layerinit.c +++ b/miext/layer/layerinit.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.6tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index ef412a2c55..eb3fec8976 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $ + * $XFree86$ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 401dfd96f3..8dcba062dd 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.2 2001/06/04 09:45:41 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 44a5df24c6..177df4e355 100644 --- a/miext/layer/layerwin.c +++ b/miext/layer/layerwin.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.7tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h index 56afd73317..dab0c6f467 100644 --- a/miext/rootless/accel/rlAccel.h +++ b/miext/rootless/accel/rlAccel.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlAccel.h,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ /* * rlBlt.c diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index ba6fdf2276..6711c500ef 100644 --- a/miext/rootless/accel/rlBlt.c +++ b/miext/rootless/accel/rlBlt.c @@ -26,7 +26,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlBlt.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index cbd58b4cfc..8e063a3475 100644 --- a/miext/rootless/accel/rlCopy.c +++ b/miext/rootless/accel/rlCopy.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlCopy.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index 7fd7adfa86..e33b40d458 100644 --- a/miext/rootless/accel/rlFill.c +++ b/miext/rootless/accel/rlFill.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFill.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index 2ce9eae2b6..ca39852981 100644 --- a/miext/rootless/accel/rlFillRect.c +++ b/miext/rootless/accel/rlFillRect.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillRect.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index fd5ee35f56..b91f734c1c 100644 --- a/miext/rootless/accel/rlFillSpans.c +++ b/miext/rootless/accel/rlFillSpans.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillSpans.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index 2bf2da64b3..da28204eb8 100644 --- a/miext/rootless/accel/rlGlyph.c +++ b/miext/rootless/accel/rlGlyph.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ #include "fb.h" #include "fontstruct.h" diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index e2249569b9..4ff4798c13 100644 --- a/miext/rootless/accel/rlSolid.c +++ b/miext/rootless/accel/rlSolid.c @@ -26,7 +26,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlSolid.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index 2b375706f1..aefefcab20 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.6 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.5 2003/10/18 00:00:34 torrey Exp $ */ #ifndef _ROOTLESS_H #define _ROOTLESS_H diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index bc6259ea65..85655a9e11 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.5 2003/11/10 18:22:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4tsi Exp $ */ #include "rootlessCommon.h" diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index 973ec62917..c75c45a2ee 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.4 2003/09/16 00:36:20 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 1a1a48a4a3..93e987fe7e 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index 8c70135a10..b370d2beb1 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #include "mi.h" #include "scrnintstr.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index beb737df18..21c62c4ef6 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */ #include "mi.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index a959179395..ad1fa353ad 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -3,7 +3,7 @@ * * This file is very closely based on mivaltree.c. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.1tsi Exp $ */ /* * mivaltree.c -- diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index eb6ac3cd99..1656659179 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.11 2003/11/27 01:53:39 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.10 2003/11/13 20:26:31 torrey Exp $ */ #include "rootlessCommon.h" #include "rootlessWindow.h" diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index f6736f5441..6c26bace30 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h index 90efec5c84..63922aeec5 100644 --- a/miext/rootless/safeAlpha/safeAlpha.h +++ b/miext/rootless/safeAlpha/safeAlpha.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.3 2004/01/19 01:22:48 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.2 2003/10/18 00:00:34 torrey Exp $ */ #ifndef _SAFEALPHA_H #define _SAFEALPHA_H diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c index 3c9d396280..a10e7456ca 100644 --- a/miext/rootless/safeAlpha/safeAlphaPicture.c +++ b/miext/rootless/safeAlpha/safeAlphaPicture.c @@ -32,7 +32,7 @@ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. */ - /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */ + /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.3 2003/10/24 00:33:15 torrey Exp $ */ #ifdef RENDER diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 252124f3f7..41ea77cf76 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -32,7 +32,7 @@ * * Copyright © 1998 Keith Packard */ -/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1 2003/09/16 00:36:20 torrey Exp $ */ #include "fb.h" #include "safeAlpha.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 38a92953fd..260c840a59 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.14tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index d8ade93dc6..d343a171f8 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.6tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 028ec26a5b..9edd8338e2 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 818a37a8e1..4414097766 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.4 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 1487829567..aaa6d58eb6 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index c82b5f9317..3d4a3724d3 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index a1ff273de0..16b146352f 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index 7ba41833e7..3786444d4c 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index 0b3c4e0acb..d2c9271f47 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 574b3a157e..36cf944899 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 327636efb4..3ef791608f 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 8386222678..943d6485e5 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index b0dd283161..0038c624cf 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 9bdb18e258..1183ba65a2 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 7af181f198..885c5e9a2f 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 316c0c690e..7bdb2a9321 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index bed542f6d3..483f05f799 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index f2618fc477..8c93d21ed0 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86$ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 1277c2ee1c..a0f5b6e067 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.4tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index ce9b4c5614..507cabb563 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.3 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/os/WaitFor.c b/os/WaitFor.c index 221296d116..3283dd5cf1 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.43 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -604,7 +604,8 @@ DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSStandbyTime - timeout; } if (DPMSPowerLevel < DPMSModeStandby) { - DPMSSet(DPMSModeStandby); + if (DPMSEnabled) + DPMSSet(DPMSModeStandby); } return DPMSStandbyTime; } @@ -618,7 +619,8 @@ DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSSuspendTime - timeout; } if (DPMSPowerLevel < DPMSModeSuspend) { - DPMSSet(DPMSModeSuspend); + if (DPMSEnabled) + DPMSSet(DPMSModeSuspend); } return DPMSSuspendTime; } @@ -632,7 +634,8 @@ DPMSOffTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSOffTime - timeout; } if (DPMSPowerLevel < DPMSModeOff) { - DPMSSet(DPMSModeOff); + if (DPMSEnabled) + DPMSSet(DPMSModeOff); } return DPMSOffTime; } diff --git a/os/access.c b/os/access.c index 14b61839cf..53dede0ed9 100644 --- a/os/access.c +++ b/os/access.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.54 2004/01/03 17:38:39 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */ #ifdef WIN32 #include diff --git a/os/auth.c b/os/auth.c index a1cbc8c1fa..40f34ffff2 100644 --- a/os/auth.c +++ b/os/auth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */ +/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */ /* * authorization hooks for the server diff --git a/os/connection.c b/os/connection.c index 7465e7eff2..40c80d3428 100644 --- a/os/connection.c +++ b/os/connection.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.65 2003/10/30 21:21:10 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.64 2003/10/07 22:50:42 herrb Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * diff --git a/os/io.c b/os/io.c index cf8a0343eb..956a533000 100644 --- a/os/io.c +++ b/os/io.c @@ -53,7 +53,7 @@ SOFTWARE. * InsertFakeRequest, ResetCurrentRequest * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/os/io.c,v 3.35 2003/04/27 21:31:08 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */ #if 0 #define DEBUG_COMMUNICATION diff --git a/os/k5auth.c b/os/k5auth.c index 8c59fe8ab2..3726df6ba2 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */ /* * Kerberos V5 authentication scheme diff --git a/os/lbxio.c b/os/lbxio.c index ae4d4355f4..ba79040b53 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/os/mitauth.c b/os/mitauth.c index bddbdf1d6b..97f88b2328 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.4 2001/01/17 22:37:11 dawes Exp $ */ /* * MIT-MAGIC-COOKIE-1 authorization scheme diff --git a/os/oscolor.c b/os/oscolor.c index f6e941fb8c..557d539bb8 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osdep.h b/os/osdep.h index a5392ffc34..2b9eb5674e 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osinit.c b/os/osinit.c index 1c56d0af78..1a5ff0501a 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.30 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/rpcauth.c b/os/rpcauth.c index 512b3ecb5f..f0693f5990 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.7 2001/12/14 20:00:35 dawes Exp $ */ /* * SUN-DES-1 authentication mechanism diff --git a/os/secauth.c b/os/secauth.c index 4f90fe9a96..8c30eaafbc 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -24,7 +24,7 @@ not be 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/programs/Xserver/os/secauth.c,v 1.11 2001/12/14 20:00:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ #include "X.h" #include "os.h" diff --git a/os/strlcat.c b/os/strlcat.c index cda5c6ab99..7031de3a6a 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86$ */ #include diff --git a/os/strlcpy.c b/os/strlcpy.c index 14e45ef8c1..71657da69b 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -15,7 +15,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86$ */ #include #include diff --git a/os/utils.c b/os/utils.c index 6f5d17b657..805dfc84ac 100644 --- a/os/utils.c +++ b/os/utils.c @@ -50,7 +50,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.97 2004/01/09 00:35:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */ #ifdef __CYGWIN__ #include diff --git a/os/xalloc.c b/os/xalloc.c index 8bb46e2c9a..6412deb335 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Pascal Haible. */ -/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.36 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.35tsi Exp $ */ /* Only used if INTERNAL_MALLOC is defined * - otherwise xalloc() in utils.c is used diff --git a/os/xdmauth.c b/os/xdmauth.c index 13695c13c6..4ec7265ddf 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.9 2003/06/24 15:44:48 eich Exp $ */ +/* $XFree86: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and diff --git a/os/xdmcp.c b/os/xdmcp.c index 0138f02019..9489afc44e 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -14,7 +14,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.32 2004/01/01 17:09:29 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ #ifdef WIN32 /* avoid conflicting definitions */ diff --git a/randr/mirandr.c b/randr/mirandr.c index b45a1f9a82..1dc173a964 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randr.c b/randr/randr.c index c0a8c4bf89..b253ddbab8 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randrstr.h b/randr/randrstr.h index d966cd5b71..48213185cb 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * diff --git a/record/record.c b/record/record.c index a7e8dc6a02..93cb1dea90 100644 --- a/record/record.c +++ b/record/record.c @@ -33,7 +33,7 @@ This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */ #define NEED_EVENTS #include "dixstruct.h" diff --git a/record/set.c b/record/set.c index 847a1b28da..3415166642 100644 --- a/record/set.c +++ b/record/set.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */ /* diff --git a/record/set.h b/record/set.h index 169077720d..6f0b872a19 100644 --- a/record/set.h +++ b/record/set.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86$ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension diff --git a/render/animcur.c b/render/animcur.c index fcf6a25a77..b00cdf682e 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.5tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/filter.c b/render/filter.c index a2f7563cb4..4435197e26 100644 --- a/render/filter.c +++ b/render/filter.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $ + * $XFree86$ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/glyph.c b/render/glyph.c index b4f08c2232..5dd700581f 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.6 2001/10/28 03:34:19 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.5 2001/01/30 07:01:22 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/glyphstr.h b/render/glyphstr.h index 99f55e3eb5..68d6f2085f 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.4 2001/01/21 21:19:39 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miglyph.c b/render/miglyph.c index 00b6764d62..8d0c2079bc 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.4 2000/11/20 07:13:13 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miindex.c b/render/miindex.c index 739348273f..aff610940c 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.8 2002/11/06 22:45:36 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.7 2002/11/05 06:05:04 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mipict.c b/render/mipict.c index 0f0cf6c8b9..ed97acc7bc 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.16 2003/11/10 18:22:52 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.15tsi Exp $ * * Copyright © 1999 Keith Packard * diff --git a/render/mipict.h b/render/mipict.h index 0154fb5f01..4af4c56beb 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.13 2002/11/06 22:45:36 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.12 2002/11/05 05:34:40 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/mirect.c b/render/mirect.c index 33c7a9f148..63e9c7cc47 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.4 2001/06/08 19:36:34 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.3 2000/12/08 07:52:05 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitrap.c b/render/mitrap.c index 7f592ccd48..05db36ec8e 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.9 2002/11/05 23:39:16 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitri.c b/render/mitri.c index fc706f117a..b0526256df 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.5 2002/05/31 16:48:52 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/picture.c b/render/picture.c index b2ef69bdfb..ad746b2776 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.c,v 1.30 2003/01/26 16:40:43 eich Exp $ + * $XFree86: xc/programs/Xserver/render/picture.c,v 1.29 2002/11/23 02:38:15 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picture.h b/render/picture.h index c47d519416..379e8fb596 100644 --- a/render/picture.h +++ b/render/picture.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/picture.h,v 1.20tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picturestr.h b/render/picturestr.h index d7ae833855..79978cc750 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -1,6 +1,6 @@ /* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ /* - * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/render.c b/render/render.c index c096f292c1..24e15143df 100644 --- a/render/render.c +++ b/render/render.c @@ -1,6 +1,6 @@ /* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ /* - * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index 5bc7f65fc9..a6fec50f57 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index 209631e723..6aa41d06e1 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index 20def46ba0..d1fd14f27e 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 06660ff89e..afc0dbebdf 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index bb02619f35..6eee7e097a 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index 2485488d20..c4a6ec7a08 100644 --- a/xkb/ddxConfig.c +++ b/xkb/ddxConfig.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.8 2002/12/20 20:18:35 paulo Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index c7c8f18b89..16c9f15b96 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index 5f5ebc9b4f..0ce401adb4 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 9f54cae6ff..033aa18ea0 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 57751a0c0d..4aaf5bb61b 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -25,7 +25,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index a8c436ea2d..dea4ce607c 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index afd028fcd2..c0b2b80187 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 9ac7d33007..98744ed97e 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index ab757c6fc6..e7c484cab8 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86$ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 5101de53b4..30510ffaae 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */ #include #include diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 9f7704c5ac..ed61becb0c 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */ #include #include diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index dd7ef4630a..852e2386f4 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index ec43f79db1..bbd0d1ac1b 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/maprules.c b/xkb/maprules.c index c588ae399d..330f9fe90d 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ #include #include diff --git a/xkb/xkb.c b/xkb/xkb.c index f43fb285ff..fcc156d355 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */ #include #include "X.h" diff --git a/xkb/xkb.h b/xkb/xkb.h index 4eeb781db8..704cd49c0d 100644 --- a/xkb/xkb.h +++ b/xkb/xkb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/xkb/xkb.h,v 1.1 2003/07/16 01:39:08 dawes Exp $ */ +/* $XFree86$ */ /* #include "XKBfile.h" */ diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 096ebe2e4e..5794e34ba6 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */ #include #include diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 403c2fb89d..0239c678ac 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */ #include #include diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index 910616e607..7ea30bde20 100644 --- a/xkb/xkbDflts.h +++ b/xkb/xkbDflts.h @@ -1,5 +1,5 @@ /* $Xorg: xkbDflts.h,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.3 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ #ifndef DEFAULT_H diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 0cd1becace..7d2421a873 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.12 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 6ed1464946..b582845d95 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.33 2003/12/22 17:48:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */ #include #include diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index f75db6918f..26e6d87d38 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */ #include #include diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 3a9fc11f89..43288d3e99 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.9 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */ #include #include diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index 0a077f4c15..ec155645fa 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86$ */ #include #include diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 6f4ffe8a9d..4b6ba4ccc0 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */ #include "stdio.h" #include "X.h" diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index f3ba6bc174..8b439c2a56 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */ #include #include diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c index 0e480b4dff..34470ea774 100644 --- a/xkb/xkbconfig.c +++ b/xkb/xkbconfig.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */ #include #include diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index d12467ff78..351a8dac5a 100644 --- a/xkb/xkberrs.c +++ b/xkb/xkberrs.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ #include #include diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 2a6d836aa9..1b83041ee6 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ #include #include diff --git a/xkb/xkbout.c b/xkb/xkbout.c index d688aca011..3e81d64ef8 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ #include #include diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index fc593e7966..027642af62 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ #include #include diff --git a/xkb/xkmread.c b/xkb/xkmread.c index b7a08e2672..cd38cbb327 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ #include