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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ben Byer
							
						 
						
							
							
							
							
								
							
							
								0ff273fd1e 
								
							 
						 
						
							
							
								
								XDARWIN: fixes to make Xquartz build again  
							
							 
							
							
							
						 
						
							2007-09-09 16:29:08 -07:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Eamon Walsh
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ben Byer
							
						 
						
							
							
							
							
								
							
							
								fe7b8f4237 
								
							 
						 
						
							
							
								
								began to factor out code to move to darwinEvents.c  
							
							 
							
							
							
						 
						
							2007-03-05 03:48:27 -08:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Ben Byer
							
						 
						
							
							
							
							
								
							
							
								9ecf79ca01 
								
							 
						 
						
							
							
								
								Beginnings of an update Darwin driver  
							
							 
							
							
							
						 
						
							2007-02-15 05:22:21 -08:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Adam Jackson
							
						 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							 
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Daniel Stone
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Torrey Lyons
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								2fb5886200 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							 
							
							
							
						 
						
							2004-04-23 19:54:30 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								df0313d35b 
								
							 
						 
						
							
							
								
								readding XFree86's cvs IDs  
							
							 
							
							
							
						 
						
							2004-02-26 13:36:15 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Egbert Eich
							
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kaleb Keithley
							
						 
						
							
							
							
							
								
							
							
								adc7f9a4eb 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks  
							
							 
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00  
						
						
							 
							
								 
							
						 
					 
				
					
						
							
							
								 
								Kaleb Keithley
							
						 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							 
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00