Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH08.xml
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/queryobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mkfontscale/list.h
	pixman/pixman/Makefile.win32
	xorg-server/dix/devices.c
	xorg-server/dix/events.c
	xorg-server/dix/inpututils.c
	xorg-server/fb/fbbltone.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xfree86/common/xf86Module.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xfree86/man/xorg.conf.man
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/include/input.h
	xorg-server/include/inputstr.h
	xorg-server/mi/mieq.c
	xorg-server/randr/rrscreen.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in

1 files changed, 0 insertions, 9 deletions

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 627badda6..803f28a15 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -1369,15 +1369,6 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
 }

 

 Bool

-InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)

-{

-    /* This is an API-preserving noop. Instructions: Kill when no more drivers

-     * call it. The infrastructure behind hasn't really been used, so any calls

-     * are likely just a declaration that the device is absolute. */

-    return FALSE;

-}

-

-Bool

 InitFocusClassDeviceStruct(DeviceIntPtr dev)

 {

     FocusClassPtr focc;