From f5e157731e6b51421ac89cfefb666b8bbf971b03 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 17 Jul 2013 13:18:21 +0200 Subject: mesa mkfontscale xserver git update 17 Jul 2013 xserver commit 74469895e39fa38337f59edd64c4031ab9bb51d8 mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 mesa commit b20e0fb5204ea85904e9f72f583e65bf35b446cb --- xorg-server/hw/xfree86/man/xorg.conf.man | 3 ++- xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'xorg-server/hw/xfree86') diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man index 67d8594fb..fa5b5fe92 100644 --- a/xorg-server/hw/xfree86/man/xorg.conf.man +++ b/xorg-server/hw/xfree86/man/xorg.conf.man @@ -972,7 +972,8 @@ is constructed. This is mainly a matter of personal preference. .BI "Option \*qConstantDeceleration\*q \*q" real \*q Makes the pointer go .B deceleration -times slower than normal. Most useful for high-resolution devices. +times slower than normal. Most useful for high-resolution devices. A value +between 0 and 1 will speed up the pointer. .TP 7 .BI "Option \*qAdaptiveDeceleration\*q \*q" real \*q Allows to actually decelerate the pointer when going slow. At most, it will be diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h index e931b09a1..eb0a338c9 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h @@ -277,12 +277,7 @@ struct pcvtid { #include #endif /* WSCONS_SUPPORT */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) #include -#else -#undef MOUSE_GETINFO -#include -#endif #endif /* Include these definitions in case ioctl_pc.h didn't get included */ #ifndef CONSOLE_X_MODE_ON -- cgit v1.2.3