diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:17 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:17 +0000 |
commit | fcbff9c13840e3b5c2952044b23a958bdead9286 (patch) | |
tree | 3f7e96b02b090aa1e61558469e4804237da0ec26 | |
parent | 9b186ebf782312d8813abf65ac66c3d66466d69e (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (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 |