8da83836b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c 
							
						 
						
							2008-01-03 17:04:54 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								140a4660ac 
								
							 
						 
						
							
							
								
								Revert "registry: Register XTrap extension protocol names."  
							
							... 
							
							
							
							This reverts commit b38a919933 
							
						 
						
							2007-11-20 18:49:30 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0b729051c0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c 
							
						 
						
							2007-11-07 15:37:23 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1eb6a1d0d2 
								
							 
						 
						
							
							
								
								XTrap: Remove usage of alloca  
							
							... 
							
							
							
							Replace with xalloc/xfree. 
							
						 
						
							2007-11-05 14:34:47 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								b38a919933 
								
							 
						 
						
							
							
								
								registry: Register XTrap extension protocol names.  
							
							
							
						 
						
							2007-10-15 18:50:06 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8b54865720 
								
							 
						 
						
							
							
								
								xace: add hooks + new access codes: XKB extension.  
							
							... 
							
							
							
							Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway. 
							
						 
						
							2007-09-28 13:34:18 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								82f97e1c0c 
								
							 
						 
						
							
							
								
								Enable event delivery for multiple heads.  
							
							... 
							
							
							
							Requires moving the spriteTrace into the DeviceIntRec and adjusting a few
functions to take in device argument, most notably XYToWindow().
Cursor rendering on the second screen is busted. 
							
						 
						
							2007-04-26 15:58:50 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2d0a63126b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver  
							
							
							
						 
						
							2006-12-19 10:31:40 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								10aabb729d 
								
							 
						 
						
							
							
								
								Convert callers of LookupDrawable() to dixLookupDrawable().  
							
							
							
						 
						
							2006-12-15 16:36:29 -05:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								ae3c24da34 
								
							 
						 
						
							
							
								
								dix:    Moving SpriteRec into DeviceIntRec  
							
							... 
							
							
							
							removing global sprite structure
	beginning to remove MPX ifdefs
xnest:  Fix to make xnest compile again 
							
						 
						
							2006-12-11 18:09:59 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4d258f3196 
								
							 
						 
						
							
							
								
								fix compiler warnings in XTrap/xtrapdi.c  
							
							
							
						 
						
							2006-06-19 11:27:47 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								1bbd5e49b1 
								
							 
						 
						
							
							
								
								Bug  #5869 : Remove traces of EXTMODULE define, which doesn't appear to be  
							
							... 
							
							
							
							useful any more. (George Fufutos) 
							
						 
						
							2006-02-16 04:59:45 +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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00