frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw
History
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
..
darwin Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
dmx Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
kdrive Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
vfb Convert servers to using _DEPENDENCIES to ensure proper rebuilds. 2007-08-31 13:09:45 -07:00
xfree86 Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
xgl Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
xnest Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
xprint Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
xwin Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
Makefile.am DDX changes for XDarwin 2007-09-06 05:34:14 -07:00