From f30944251e486c4a23945267803e08f580d4b0b3 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:49:16 +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).

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

diff --git a/xrdb.c b/xrdb.c
index 0f74c8a..9a5e64d 100644
--- a/xrdb.c
+++ b/xrdb.c
@@ -30,7 +30,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.17 2003/07/20 16:12:20 tsi Exp $ */
+/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.16tsi Exp $ */
 
 /*
  * this program is used to load, or dump the resource manager database
diff --git a/xrdb.man b/xrdb.man
index 279ea3a..f3d6ceb 100644
--- a/xrdb.man
+++ b/xrdb.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.8 2001/12/14 20:02:14 dawes Exp $
+.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.7 2001/01/27 18:21:22 dawes Exp $
 .\"
 .TH XRDB 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3