From fcbff9c13840e3b5c2952044b23a958bdead9286 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:49:17 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

---
 xsetroot.c   | 2 +-
 xsetroot.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xsetroot.c b/xsetroot.c
index 4dd1b3d..c49d724 100644
--- a/xsetroot.c
+++ b/xsetroot.c
@@ -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
-- 
cgit v1.2.3