xserver-multidpi/hw/kdrive/savage
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
..
s3.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3.h Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
s3.nick Update RCS tags, fix keyboard hang on VT switch, fix scroll wheel mice, add 2003-07-07 19:13:03 +00:00
s3clock.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3cmap.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3curs.c Clean up unused #ifdefs from fb. 2007-07-05 15:56:25 -04:00
s3draw.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
s3draw.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
s3gc.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3reg.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3reg.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3rtst.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
s3stub.c Death to RCS tags. 2007-06-29 14:06:52 -04:00