23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES

    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).

2 files changed, 2 insertions, 2 deletions

diff --git a/xrandr.c b/xrandr.c
index 79af8dd..00ee672 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xrandr/xrandr.c,v 1.12 2002/11/01 20:04:00 keithp Exp $
+ * $XFree86: xc/programs/xrandr/xrandr.c,v 1.11 2002/10/14 18:01:43 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  * Copyright © 2002 Hewlett Pacard Company, Inc.
diff --git a/xrandr.man b/xrandr.man
index 0bb9308..5babc40 100644
--- a/xrandr.man
+++ b/xrandr.man
@@ -19,7 +19,7 @@
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.7 2003/07/17 19:26:33 herrb Exp $
+.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.6 2003/06/12 14:12:39 eich Exp $
 .\"
 .TH XRANDR 1 "Version 1.0" "XFree86"
 .SH NAME