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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9adea80703 
								
							 
						 
						
							
							
								
								bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff  
							
							... 
							
							
							
							This patch should fix bug 8080. 
							
						 
						
							2007-09-04 08:48:26 +01: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								82a8b99a6c 
								
							 
						 
						
							
							
								
								Move the XAA private indices to be static.  
							
							... 
							
							
							
							Technically this is an ABI break, if you aren't smart enough to be using the
getter functions.  Cope. 
							
						 
						
							2007-03-28 15:17:02 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								291e89d4f2 
								
							 
						 
						
							
							
								
								Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.  
							
							
							
						 
						
							2006-04-30 19:16:14 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c3d1403672 
								
							 
						 
						
							
							
								
								Remove libcwrapper usage from xorg server modules. The libcwrapper is only  
							
							... 
							
							
							
							of (marginal) use in the drivers, and that usage remains. 
							
						 
						
							2006-02-10 22:00:30 +00: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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00