diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:47 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:47 +0000 |
| commit | 76f134caf8da6a08f0fb3587868efaec401c7e74 (patch) | |
| tree | 778ead57bb5e66e62511617505b2281695d353dc | |
| parent | 634976e69c2d0cd014ac537acb1e52884c1d89b2 (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
| -rw-r--r-- | include/X11/extensions/Xrandr.h | 2 | ||||
| -rw-r--r-- | man/Xrandr.man | 9 | ||||
| -rw-r--r-- | src/Xrandr.c | 2 | ||||
| -rw-r--r-- | src/Xrandrint.h | 2 |
4 files changed, 8 insertions, 7 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 0786767..bf78094 100644 --- a/man/Xrandr.man +++ b/man/Xrandr.man @@ -1,5 +1,6 @@ .\" -.\" $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$ .\" .\" Copyright 2002 Hewlett-Packard Company.\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +26,7 @@ .ns .TP \\$1 .. -.TH XRANDR 3 "Version 1.0" "XFree86" +.TH XRANDR __libmansuffix__ __vendorversion__ .SH NAME Xrandr \- X Resize, Rotate and Reflection extension. @@ -346,5 +347,5 @@ is cached by the library). .B Xrandr will remain upward compatible after the current 1.0 release. .SH AUTHOR -Jim Gettys, HP, and Keith Packard, member of the XFree86 Project, Inc. and -HP. +Jim Gettys, and Keith Packard, HP. + 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, |