diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
| commit | a69c9b2861f591498b6886d03b5ab7878614b894 (patch) | |
| tree | 3f7e96b02b090aa1e61558469e4804237da0ec26 | |
| parent | 9b186ebf782312d8813abf65ac66c3d66466d69e (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-- | xsetroot.c | 2 | ||||
| -rw-r--r-- | xsetroot.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * Author: Mark Lillibridge, MIT Project Athena * 11-Jun-87 */ -/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.8 2001/12/14 20:02:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.7 2001/04/01 14:00:24 tsi Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/xsetroot.man b/xsetroot.man index a57eff6..1467869 100644 --- a/xsetroot.man +++ b/xsetroot.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.8 2001/12/14 20:02:23 dawes Exp $ +.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.7 2001/01/27 18:21:23 dawes Exp $ .\" .TH XSETROOT 1 __xorgversion__ .SH NAME |