diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:43 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:43 +0000 |
commit | cee220fb44220c1659e1ab4bbb6029eb42b4abe2 (patch) | |
tree | c3091bba2a7ef4c42f4b48ee4dc288e37fd8655d | |
parent | d2ab16f347881043137407497d5bc0a5be3857e2 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | xwud.c | 2 | ||||
-rw-r--r-- | xwud.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 */ @@ -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 |