Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
		
						commit
						3518e2d0de
					
				|  | @ -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., | ||||
|  |  | |||
|  | @ -47,8 +47,6 @@ | |||
| 
 | ||||
| #include "glxserver.h" | ||||
| 
 | ||||
| #include <xf86_ansic.h> | ||||
| 
 | ||||
| #include <windowstr.h> | ||||
| 
 | ||||
| #include "glxfbconfig.h" | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue