diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:23:08 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:23:08 +0000 |
commit | 517aed7ebcd3a71177883b495c86a040483ac623 (patch) | |
tree | 6fcf3d25ba00fc497d04b6f10fad0fc9bcf6b54d | |
parent | 12bba3408db8460ac2161bacd640aad80214a332 (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/XF86Misc.man | 9 | ||||
-rw-r--r-- | src/XF86Misc.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/man/XF86Misc.man b/man/XF86Misc.man index bb76beb..fe4f3d7 100644 --- a/man/XF86Misc.man +++ b/man/XF86Misc.man @@ -1,17 +1,18 @@ +.\" $XdotOrg$ .\" $TOG: XF86Misc.man /main/7 1997/07/19 10:30:32 kaleb $ .\" .\" .\" .\" Copyright (c) 1996 Joe Moss, The XFree86 Project .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.13 2003/11/23 05:40:36 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.12 2002/12/22 00:46:54 dawes Exp $ .de ZN .ie t \fB\^\\$1\^\fR\\$2 .el \fI\^\\$1\^\fP\\$2 .. -.TH XF86MISC 3X11 __vendorversion__ "X FUNCTIONS" +.TH XF86MISC __libmansuffix__ __vendorversion__ "X FUNCTIONS" .SH NAME -XF86MiscQueryExtension, XF86MiscQueryVersion, XF86MiscGetMouseSettings, XF86MiscSetMouseSettings, XF86MiscGetKbdSettings, XF86MiscSetKbdSettings \- XFree86-Misc extension interface functions +XF86MiscQueryExtension, XF86MiscQueryVersion, XF86MiscGetMouseSettings, XF86MiscSetMouseSettings, XF86MiscGetKbdSettings, XF86MiscSetKbdSettings \- Extension library for the XFree86-Misc X extension. .SH SYNTAX .nf .LP @@ -210,7 +211,7 @@ Keyboard types .IP \fBMF_\fP* 1i Mouse flags .SH "SEE ALSO" -xset(1), XF86Config(__filemansuffix__) +xset(__appmansuffix__), __xconfigfile__(__filemansuffix__) .SH AUTHORS Joe Moss and David Dawes, The XFree86 Project, Inc. diff --git a/src/XF86Misc.c b/src/XF86Misc.c index 3312d07..b0669d5 100644 --- a/src/XF86Misc.c +++ b/src/XF86Misc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.13 2003/04/03 16:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.12 2002/11/20 04:04:57 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc |