xserver-multidpi/hw/xgl/glx
Eamon Walsh 97c150b61b Merge branch 'master' into XACE-SELINUX
Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
..
module Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
Makefile.am Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
xglx.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
xglx.h make core keyboard/pointer map functions act on all core-sending devices 2006-09-29 00:34:23 +03:00
xglxinit.c make core keyboard/pointer map functions act on all core-sending devices 2006-09-29 00:34:23 +03:00
xglxorg.c Updated xgl code drop from Novell + xserver tree changes 2006-01-18 07:15:55 +00:00