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

---
 include/X11/extensions/XRes.h | 4 ++--
 man/XRes.man                  | 4 ++--
 src/XRes.c                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h
index 93779c6..5cb43aa 100644
--- a/include/X11/extensions/XRes.h
+++ b/include/X11/extensions/XRes.h
@@ -1,8 +1,8 @@
 /*
    Copyright (c) 2002  XFree86 Inc
 */
-/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
-/* $XFree86: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
+: /* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
 
 #ifndef _XRES_H
 #define _XRES_H
diff --git a/man/XRes.man b/man/XRes.man
index 1cc61d7..3654777 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -1,6 +1,6 @@
 .\"
-.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
-.\" $XFree86: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
+: .\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
+.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $
 .\"
 .\" Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
 .\" 
diff --git a/src/XRes.c b/src/XRes.c
index 3e9bf24..474d2df 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -1,7 +1,7 @@
 /*
    Copyright (c) 2002  XFree86 Inc
 */
-/* $XFree86: xc/lib/XRes/XRes.c,v 1.4 2002/10/16 00:37:26 dawes Exp $ */
+/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-- 
cgit v1.2.1