Peter Hutterer 4f2cd0ed96 Merge branch 'master' into mpx ...

This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c

2008-03-04 18:11:10 +10:30

..

dixsym.c

registry: Add a call for DTRACE compatibility.

2007-11-26 15:59:01 -05:00

dlloader.c

Simplify dlloader a bit more.

2008-02-14 08:52:43 +11:00

dlloader.h

Remove a useless open() of the module we're about to load.

2006-07-21 22:55:41 -04:00

extsym.c

Fix Xinerama's consolidated visual handling.

2008-02-22 15:19:54 -05:00

fontsym.c

Unbreak unbreaking the loader. Re-add the symbol reference lists so that the

2006-06-21 20:49:21 -04:00

loader.c

Static cleanups, dead code deletion.

2007-03-25 12:27:01 -04:00

loader.h

Remove dead function prototypes.

2006-07-26 19:39:17 -04:00

loaderProcs.h

Remove some braindamage from ModuleDesc.

2008-02-14 08:22:57 +11:00

loadext.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loadfont.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loadmod.c

xfree86: plug memory leak in InitPathList.

2008-02-18 18:14:33 +10:30

Makefile.am

Create driver-independent CRTC-based cursor layer.

2007-03-15 00:02:40 -07:00

misym.c

Merge branch 'master' into XACE-SELINUX

2007-10-25 12:19:30 -04:00

os.c

Add some more support for DragonFly. From Joerg Sonnenberger

2007-08-16 11:20:12 -05:00

SparcMulDiv.S

Merging XORG-CURRENT into trunk

2004-04-23 19:54:30 +00:00

sym.h

Unbreak unbreaking the loader. Re-add the symbol reference lists so that the

2006-06-21 20:49:21 -04:00

xf86sym.c

Merge branch 'master' into mpx

2008-03-04 18:11:10 +10:30