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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a8a148919b 
								
							 
						 
						
							
							
								
								Superfluous ','.  
							
							
							
						 
						
							2007-10-23 16:23:28 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d0dc9698ae 
								
							 
						 
						
							
							
								
								Revert "Fix <pixman.h> include to <pixman/pixman.h>"  
							
							... 
							
							
							
							The pixman headers have been located under pixman-1/ instead of pixman/ since
around 2007-08-06, and pixman-1.pc has the updated include paths to account
for this.
This reverts commit feb1b3e455 
							
						 
						
							2007-08-22 09:00:45 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								feb1b3e455 
								
							 
						 
						
							
							
								
								Fix <pixman.h> include to <pixman/pixman.h>  
							
							
							
						 
						
							2007-08-22 16:54:29 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								aa3c6aaaab 
								
							 
						 
						
							
							
								
								Require pixman-1 0.9.4, update pixman includes to new scheme  
							
							
							
						 
						
							2007-08-06 19:00:59 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0fcd17c918 
								
							 
						 
						
							
							
								
								Use pixman short formats, revert the gradient_stop change  
							
							
							
						 
						
							2007-05-15 17:59:13 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f2e30e7d0a 
								
							 
						 
						
							
							
								
								Use the pixman fixed point types and macros  
							
							
							
						 
						
							2007-05-15 16:51:21 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c7ac485a59 
								
							 
						 
						
							
							
								
								Remove the default case from fbcompose.c switches which should cover all cases.  
							
							... 
							
							
							
							Instead, stick the NULL return default case afterwards, so that the compiler can
warn us when we've got unimplemented cases.  Removes some unimplemented and
unused 8bpp, depth 4 picture format names. 
							
						 
						
							2006-06-23 13:56:20 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e1672a12eb 
								
							 
						 
						
							
							
								
								Convert PICT_* names from #defines to an enum to aid in debugging.  
							
							
							
						 
						
							2006-06-19 15:11:55 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b37c515320 
								
							 
						 
						
							
							
								
								Add support for x4a4 format (depth 4 at 8bpp). Bug  #6325 .  
							
							
							
						 
						
							2006-04-19 21:56:13 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								825a95a1fa 
								
							 
						 
						
							
							
								
								Remove use of dix-config and xorg-config.h from public headers.  
							
							
							
						 
						
							2005-08-24 11:18:35 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e03198972c 
								
							 
						 
						
							
							
								
								Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.  
							
							... 
							
							
							
							Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>. 
							
						 
						
							2005-07-03 07:02:09 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								eca5dff173 
								
							 
						 
						
							
							
								
								Render performance improvements. (Lars Knoll, Zack Rusin)  
							
							
							
						 
						
							2005-05-09 12:46:53 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								44f4713a05 
								
							 
						 
						
							
							
								
								Encoding of numerous files changed to UTF-8  
							
							
							
						 
						
							2004-12-04 00:43:13 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9826b83826 
								
							 
						 
						
							
							
								
								Bufzilla  #1802 ,  http://freedesktop.org/bugzilla/show_bug.cgi?id=1802  Added  
							
							... 
							
							
							
							mingw (Win32) port 
							
						 
						
							2004-11-15 15:06:51 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								196aafb19a 
								
							 
						 
						
							
							
								
								Add RenderAddTraps. Rewrite trapezoid rendering code.  
							
							
							
						 
						
							2004-08-06 23:42:10 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d4a101d4ef 
								
							 
						 
						
							
							
								
								Integration of DAMAGE-XFIXES branch to trunk  
							
							... 
							
							
							
							https://freedesktop.org/bugzilla/show_bug.cgi?id=859 
These RENDER changes come from the experimental freedesktop tree formerly
    known as "Xserver". Partly motivated by compatibility with DAMAGE as
    pulled from that tree, also some of the code just is better
    implemented.
Modified Files: filter.c picture.c picture.h picturestr.h 
						
							2004-07-29 18:37:54 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2fb5886200 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							
							
						 
						
							2004-04-23 19:54:30 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								dae90c3af9 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004  
							
							
							
						 
						
							2004-03-14 08:34:49 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								867451f1ab 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004  
							
							
							
						 
						
							2004-03-03 12:12:50 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								df0313d35b 
								
							 
						 
						
							
							
								
								readding XFree86's cvs IDs  
							
							
							
						 
						
							2004-02-26 13:36:15 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								147aae87fd 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004  
							
							
							
						 
						
							2004-02-26 09:23:53 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								adc7f9a4eb 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks  
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00