Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
		
						commit
						e73e5e2a4d
					
				| 
						 | 
				
			
			@ -1,3 +1,4 @@
 | 
			
		|||
/*
 | 
			
		||||
** The contents of this file are subject to the GLX Public License Version 1.0
 | 
			
		||||
** (the "License"). You may not use this file except in compliance with the
 | 
			
		||||
** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue