Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

2 files changed, 4 insertions, 5 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..2e1d114 100644
--- a/xrandr.man
+++ b/xrandr.man
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright 2001 Keith Packard, member of The XFree86 Project, Inc..\"
+.\" Copyright 2001 Keith Packard.\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
@@ -19,9 +19,9 @@
 .\" 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"
+.TH XRANDR __appmansuffix__ __vendorversion__
 .SH NAME
 xrandr \- primitive command line interface to RandR extension
 .SH SYNOPSIS
@@ -69,7 +69,6 @@ when events are received to enable debugging.
 Xrandr(3)
 .SH AUTHORS
 Keith Packard,
-XFree86 Core Team and Cambridge Research Laboratory, HP Labs, HP.
 and
 Jim Gettys, 
 Cambridge Research Laboratory, HP Labs, HP.