27612748e0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into XACE-SELINUX  
							
							... 
							
							
							
							Conflicts:
	dix/devices.c 
							
						 
						
							2007-09-26 07:47:29 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c140d20f4a 
								
							 
						 
						
							
							
								
								XDarwin:  mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore  
							
							
							
						 
						
							2007-09-19 05:58:22 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b6c0697fd6 
								
							 
						 
						
							
							
								
								fixed path for event_status_driver.h  
							
							... 
							
							
							
							(The path currently used is deprecated on Tiger and invalid on Leopard.) 
							
						 
						
							2007-09-05 04:40:03 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								47ab4d648b 
								
							 
						 
						
							
							
								
								devPrivates rework: convert CursorRec and CursorBits over to new interface.  
							
							
							
						 
						
							2007-08-30 11:40:39 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4017d31902 
								
							 
						 
						
							
							
								
								devPrivates rework: since API is already broken, switch everything  
							
							... 
							
							
							
							over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates. 
							
						 
						
							2007-08-28 09:28:25 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								136bb4874a 
								
							 
						 
						
							
							
								
								iokit support for XDarwin  
							
							
							
						 
						
							2007-02-15 05:14:38 -08: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								35a3bf13a8 
								
							 
						 
						
							
							
								
								Add option for XDarwin to track system keyboard layout changes as they  
							
							... 
							
							
							
							occur (John Harper and Torrey T. Lyons). 
							
						 
						
							2004-09-22 23:38:33 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								41641c11ec 
								
							 
						 
						
							
							
								
								Make XDarwin not default to StaticColor on ix86 (Shantonu Sen).  
							
							
							
						 
						
							2004-07-30 17:37:09 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								12e532010b 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.902 (RC 2)  
							
							
							
						 
						
							2003-12-19 20:55:39 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								90f1536dd3 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00