From cee220fb44220c1659e1ab4bbb6029eb42b4abe2 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:43 +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). --- xwud.c | 2 +- xwud.man | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xwud.c b/xwud.c index b0e911a..1475f06 100644 --- a/xwud.c +++ b/xwud.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xwud/xwud.c,v 3.11 2003/11/17 15:18:08 tsi Exp $ */ +/* $XFree86: xc/programs/xwud/xwud.c,v 3.10tsi Exp $ */ /* xwud - marginally useful raster image undumper */ diff --git a/xwud.man b/xwud.man index 23877cf..f0e2923 100644 --- a/xwud.man +++ b/xwud.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xwud/xwud.man,v 1.10 2003/11/15 02:40:28 dawes Exp $ +.\" $XFree86: xc/programs/xwud/xwud.man,v 1.9 2002/04/22 20:53:11 herrb Exp $ .\" .TH XWUD 1 __xorgversion__ .SH NAME -- cgit v1.2.3