diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
| commit | 59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch) | |
| tree | a797879cc0fe54172dba50354b635b1f595081db /xorg-server/hw/xwin/man/XWin.man | |
| parent | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff) | |
| parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
| download | vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2 vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winkeynames.h
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/man/XWin.man')
| -rw-r--r-- | xorg-server/hw/xwin/man/XWin.man | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man index 6e69a185d..d03a36521 100644 --- a/xorg-server/hw/xwin/man/XWin.man +++ b/xorg-server/hw/xwin/man/XWin.man @@ -176,7 +176,8 @@ milliseconds causes an emulated middle button press. The default .I timeout is 50 milliseconds. Note that most mice with scroll wheel have middle button functionality, usually you will need this option only if you have -a two button mouse without scroll wheel. +a two button mouse without scroll wheel. Default is to enable this +option if \fIWindows\fP reports a two button mouse, disabled otherwise. .TP 8 .B \-[no]keyhook Enable [disable] a low-level keyboard hook for catching |