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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b1764ddf13 
								
							 
						 
						
							
							
								
								pulling more patches over from xorg-xserver-1.2-apple branch  
							
							
							
						 
						
							2007-11-05 05:45:21 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								84efe23ae8 
								
							 
						 
						
							
							
								
								updated darwin/quartz/xpr (libXplugin interface for Mac OS X) support  
							
							
							
						 
						
							2007-02-16 04:37:38 -08:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								84683f19b4 
								
							 
						 
						
							
							
								
								get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE  
							
							... 
							
							
							
							Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone. 
							
						 
						
							2006-07-18 18:17:38 -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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								269012e601 
								
							 
						 
						
							
							
								
								Add offscreen GLX direct rendering with XDarwin's xpr backend (John  
							
							... 
							
							
							
							Harper). 
							
						 
						
							2004-09-21 22:01:14 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								90f1536dd3 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00