xserver-multidpi/XTrap
Peter Hutterer 0b729051c0 Merge branch 'master' into mpx
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
..
Makefile.am get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
xtrapddmi.c dix, Xext, Xtrap, Xi: replace inputInfo.pointer with PickPointer where 2007-03-02 17:14:37 +10:30
xtrapdi.c Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
xtrapdiswp.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
xtrapditbl.c Death to RCS tags. 2007-06-29 14:06:52 -04:00