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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								fa47910045 
								
							 
						 
						
							
							
								
								Clean up many #if 0.  
							
							
							
						 
						
							2007-12-02 12:40:25 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a52c9b2a59 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c 
							
						 
						
							2007-11-05 19:08:36 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								934281126f 
								
							 
						 
						
							
							
								
								Xext: Remove usage of alloca  
							
							... 
							
							
							
							Replace with heap allocations. 
							
						 
						
							2007-11-05 14:34:46 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9bd04055a2 
								
							 
						 
						
							
							
								
								xace: change prototype of VALIDATE_DRAWABLE_AND_GC macro to allow access  
							
							... 
							
							
							
							mode to be passed to dixLookupDrawable. 
							
						 
						
							2007-09-25 09:33:51 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								25d5e0a629 
								
							 
						 
						
							
							
								
								Convert callers of SecurityLookupWindow() to dixLookupWindow().  
							
							
							
						 
						
							2006-12-15 15:50:46 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5e334f06a1 
								
							 
						 
						
							
							
								
								Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC.  
							
							
							
						 
						
							2006-12-14 18:27:09 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								51b69ff499 
								
							 
						 
						
							
							
								
								Remove instances of macro SECURITY_VERIFY_DRAWABLE.  
							
							
							
						 
						
							2006-12-14 17:53:43 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0cf75e7432 
								
							 
						 
						
							
							
								
								Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE.  
							
							
							
						 
						
							2006-12-14 17:45:11 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6c46645cfc 
								
							 
						 
						
							
							
								
								Naming change: Security*Access -> Dix*Access  
							
							
							
						 
						
							2006-12-14 14:45:42 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0bb669638f 
								
							 
						 
						
							
							
								
								Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".  
							
							
							
						 
						
							2005-07-03 08:53:54 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9b1debcdb6 
								
							 
						 
						
							
							
								
								Change all misc.h and os.h references to <X11/foo.h>.  
							
							
							
						 
						
							2005-07-01 22:43:43 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								292c4cff26 
								
							 
						 
						
							
							
								
								Fix includes right throughout the Xserver tree:  
							
							... 
							
							
							
							change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. 
							
						 
						
							2005-04-20 12:25:48 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0664db19bf 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							
							
						 
						
							2004-04-23 18:54:16 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d568221710 
								
							 
						 
						
							
							
								
								XFree86 4.3.0.1  
							
							
							
						 
						
							2003-11-14 16:49:22 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ded6147bfb 
								
							 
						 
						
							
							
								
								R6.6 is the Xorg base-line  
							
							
							
						 
						
							2003-11-14 15:54:54 +00:00