summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:46:58 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:46:58 +0000
commit50086e500a2eea4162828aa59d8ccfa7da9dfdee (patch)
tree27604e4eea1d8e0673643ff8bf4f704f5f3ac305
parent40732a273fc791a07ad7cbf26ce4f437a7f1baee (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-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--include/X11/extensions/Xrandr.h2
-rw-r--r--man/Xrandr.man2
-rw-r--r--src/Xrandr.c2
-rw-r--r--src/Xrandrint.h2
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,