From 354933180c848ef9381c89c3d079e18e6d73ca28 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:39:27 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 files.     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).

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

diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index 7a0d6c5..e27115c 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.11 2002/10/14 18:01:39 keithp Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation, Inc.
  * Copyright © 2002 Hewlett-Packard Company, Inc.
diff --git a/man/Xrandr.man b/man/Xrandr.man
index 8aa6841..4466446 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.8 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
 .\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.8 2003/11/23 05:40:36 dawes Exp $
 .\"
 .\" Copyright 2002 Hewlett-Packard Company.\"
diff --git a/src/Xrandr.c b/src/Xrandr.c
index 6b3e2f5..95563d2 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.14 2003/05/27 22:26:42 tsi Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13tsi Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation, Inc.
  * Copyright © 2002 Hewlett Packard Company, Inc.
diff --git a/src/Xrandrint.h b/src/Xrandrint.h
index 2ec5d86..87724c9 100644
--- a/src/Xrandrint.h
+++ b/src/Xrandrint.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.4 2002/10/14 18:01:40 keithp Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.2 2001/06/07 15:33:43 keithp Exp $
  *
  *
  * Copyright © 2000, Compaq Computer Corporation, 
-- 
cgit v1.2.3