xserver-multidpi/mi
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
Makefile.am Remove mfb and cfb from include paths where they're not needed. 2007-05-11 11:43:19 -04:00
mi.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
miarc.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mibank.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
mibank.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mibitblt.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mibstore.c Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
mibstore.h Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
mibstorest.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
micmap.c Bug #10560: Code-Cleanup: function declarations () -> (void) 2007-04-09 14:33:15 -07:00
micmap.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
micoord.h Restore checks for __i386 where needed for Sun compilers on Solaris 2007-11-20 18:31:07 -08:00
micursor.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
midash.c Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
midispcur.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
mieq.c xace: restore the old SaveScreens function and introduce new API, since the 2007-11-19 16:59:34 -05:00
miexpose.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mifillarc.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mifillarc.h Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
mifillrct.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mifpoly.h Make the use of ICEIL slightly less ugly. 2007-05-11 11:43:19 -04:00
mifpolycon.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
migc.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
migc.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
miglblt.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
miinitext.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
miline.h devPrivates rework: add missing include of dix/privates.h 2007-11-19 16:34:38 -05:00
mioverlay.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
mioverlay.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mipointer.c Merge branch 'master' into XACE-SELINUX 2007-10-17 15:00:54 -04:00
mipointer.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
mipointrst.h mi: remove mi motion history 2006-10-25 01:10:20 +03:00
mipoly.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
mipoly.h Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
mipolycon.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mipolygen.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mipolypnt.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mipolyrect.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mipolyseg.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mipolytext.c Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
mipolyutil.c Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
mipushpxl.c Disinfect mi/ of mfb. 2007-11-17 21:23:05 -05:00
miregion.c Revert "Fix <pixman.h> include to <pixman/pixman.h>" 2007-08-22 09:00:45 -07:00
miscanfill.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
miscrinit.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
mispans.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mispans.h Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
misprite.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
misprite.h Revert "Suppress software cursor removal during rotated shadow buffer drawing." 2007-04-19 17:49:34 -07:00
mispritest.h Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
mistruct.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
mivalidate.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
mivaltree.c Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
miwideline.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
miwideline.h Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
miwindow.c Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
mizerarc.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00
mizerarc.h Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
mizerclip.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
mizerline.c mi: Remove usage of alloca 2007-11-05 14:34:41 +00:00