summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:49:16 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:49:16 +0000
commit716e4f552213b645ad519153e8e6afdb55302eb4 (patch)
tree2a4dc3725b49057a28bd3ca523e0fd5e8393dd88
parent40a45eb8c079d8e1794ee58c5b265f3698a01c8b (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--xrandr.c2
-rw-r--r--xrandr.man2
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