e8777a91f3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mpx  
							
							... 
							
							
							
							Conflicts:
	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c 
							
						 
						
							2007-04-02 15:36:26 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								5f9c10e8da 
								
							 
						 
						
							
							
								
								Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related  
							
							... 
							
							
							
							information into a new SpriteInfoRec, remove isMPDev flag. 
							
						 
						
							2007-03-25 15:00:03 +09:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4aaaa70d1b 
								
							 
						 
						
							
							
								
								Xi:	Adding ChangePointerKeyboardPairing request  
							
							... 
							
							
							
							Adding PointerKeyboardPairingChanged event
	Correct error values for XWarpDevicePointer
dix:	Adding device argument to SendMappingNotify
	Adding spriteOwner flag to devices 
							
						 
						
							2007-01-29 18:23:24 +10:30 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								202b46eb6b 
								
							 
						 
						
							
							
								
								xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default  
							
							... 
							
							
							
							to MP devices.
Xi:	Adding QueryDevicePointer request/reply
	Adding WarpDevicePointer request/reply 
							
						 
						
							2006-12-20 13:05:53 +10:30