xserver-multidpi/hw/xfree86/os-support/solaris
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
..
agpgart.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
apSolaris.shar Updated Solaris aperture driver to build on sun4v & amd64 kernels 2006-06-29 16:25:36 -07:00
Makefile.am Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS. 2007-08-30 11:26:17 -07:00
solaris-amd64.S Initial experimental support for AMD64 builds on Solaris 10 x86. Improved 2005-05-21 07:46:38 +00:00
solaris-ia32.S Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00
solaris-sparcv8plus.S Allow overriding DPMS defaults (timeouts & default for on/off) from 2004-09-22 17:20:56 +00:00
sun_agp.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sun_apm.c Add sun_apm.c for Suspend-and-Resume support on Solaris 2007-02-28 17:40:58 -08:00
sun_bell.c Make solaris version of xf86OSRingBell return void like other OS'es 2006-11-30 20:13:52 -08:00
sun_bios.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
sun_init.c Remove references to xf86Info.kbd* from solaris code 2006-11-02 16:38:47 -08:00
sun_inout.s DRI XFree86-4_3_99_12-merge import 2004-06-16 09:22:17 +00:00
sun_mouse.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
sun_vid.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00