xserver-multidpi/hw/xfree86/exa
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
..
exa.man.pre Replace a non-ascii char with the corresponding groff escape in exa.man.pre 2007-09-12 01:43:37 +02:00
examodule.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
Makefile.am Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00