xserver-multidpi/Xext
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
..
appgroup.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
appgroup.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
bigreq.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
cup.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
dpms.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
dpmsproc.h xace: add hooks + new access codes: core protocol screensaver requests 2007-08-16 10:36:05 -04:00
dpmsstubs.c Xext: remove redefinition of Bool. 2007-12-19 18:11:32 +10:30
EVI.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
EVIstruct.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
fontcache.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
geext.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
geext.h Xext: add simple macro to easily check a generic event's type. 2007-11-09 23:07:10 +10:30
geint.h Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
Makefile.am Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
mbuf.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
mbufbf.c Xext: Scruffy the janitor don't like no "register" keywords. 2007-11-21 15:59:31 +10:30
mbufpx.c Xext: Remove usage of alloca 2007-11-05 14:34:46 +00:00
mitmisc.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
panoramiX.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
panoramiX.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
panoramiXh.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
panoramiXprocs.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
panoramiXsrv.h Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
panoramiXSwap.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
sampleEVI.c Xext: Scruffy the janitor don't like no "register" keywords. 2007-11-21 15:59:31 +10:30
saver.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
security.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
securitysrv.h Rework of the XC-SECURITY extension. The gen-auth protocol has not changed, 2007-11-08 16:32:42 -05:00
shape.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
shm.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
shmint.h Export fbShmPutImage to modules. 2007-08-24 14:02:35 +02:00
sleepuntil.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sleepuntil.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sync.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xace.c Merge branch 'master' into XACE-SELINUX 2007-11-14 13:35:50 -05:00
xace.h XACE: Restore the old background None behavior in response to bug #13683. 2007-12-17 23:12:01 -05:00
xacestr.h xace: Still more changes to selection code. Removed the SelectionPtr from 2007-10-23 17:12:57 -04:00
xcalibrate.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
xcmisc.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xevie.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xf86bigfont.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xprint.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xres.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xselinux.c xselinux: Send AVC messages to audit system instead of log file/stderr. 2007-12-20 16:23:49 -05:00
xselinux.h xselinux: Add new protocol for setting device create context. 2007-12-12 20:44:59 -05:00
xtest.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xvdisp.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvdisp.h Fix swapped Xv dispatch under Xinerama. 2007-12-02 14:15:36 -05:00
xvdix.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xvmain.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
xvmc.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xvmcext.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00