From 498afadaeeb00ee22dedbcfae8baecd069c8dfdb Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:19 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- XConsole.ad | 2 +- xconsole.c | 2 +- xconsole.man | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/XConsole.ad b/XConsole.ad index 06f7db5..c3407d4 100644 --- a/XConsole.ad +++ b/XConsole.ad @@ -3,7 +3,7 @@ ! ! ! -! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.3 2001/01/17 23:45:19 dawes Exp $ +! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.2 2000/03/31 22:55:55 dawes Exp $ *allowShellResize: true XConsole.translations: #override\ diff --git a/xconsole.c b/xconsole.c index cf0a7bb..0257213 100644 --- a/xconsole.c +++ b/xconsole.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/xconsole/xconsole.c,v 3.32 2003/05/27 22:26:59 tsi Exp $ */ +/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */ #include #include diff --git a/xconsole.man b/xconsole.man index dd5fc35..8642cd8 100644 --- a/xconsole.man +++ b/xconsole.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.10 2002/10/16 02:27:40 dawes Exp $ +.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.9 2002/10/12 16:06:47 herrb Exp $ .\" .TH XCONSOLE 1 __xorgversion__ .SH NAME -- cgit v1.2.3