diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:51 +0000 |
| commit | c3a1a641b1a003ac7b4558b7897e77f0d0f0fdfa (patch) | |
| tree | 15f7d0595c60fa2f912bccf851ca78e7e37d4305 | |
| parent | 903b9ea09dadfd395120db1e844ce0fe374dfcef (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-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
| -rw-r--r-- | man/Xss.man | 7 | ||||
| -rw-r--r-- | src/XScrnSaver.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/man/Xss.man b/man/Xss.man index 96232db..95fcb63 100644 --- a/man/Xss.man +++ b/man/Xss.man @@ -1,5 +1,6 @@ .\" -.\" $XFree86: xc/lib/Xss/Xss.man,v 1.2 2003/11/23 05:05:01 dawes Exp $ +.\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $ +.\" $XdotOrg$ .\" .\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved. .\" @@ -27,7 +28,7 @@ .\" or other dealings in this Software without prior written authorization .\" from the XFree86 Project. .\" -.TH XScreenSaver 3 __vendorversion__ +.TH XScreenSaver __libmansuffix__ __vendorversion__ .SH NAME XScreenSaver \- X11 Screen Saver extension client library .SH SYNOPSIS @@ -317,7 +318,7 @@ a BadValue error is generated by .B XScreenSaverSelectInput . .PP .SH "SEE ALSO" -Xlib(1), X(7) +X(__miscmansuffix__) .SH AUTHORS Jim Fulton and Keith Packard. .SH STABILITY diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c index 120d8b2..3727ae4 100644 --- a/src/XScrnSaver.c +++ b/src/XScrnSaver.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.2 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES |