frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-07-26 11:29:21 +03:00 committed by Daniel Stone
parent eb7733a48a 3821f6aeaa
commit 3518e2d0de
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/dmx/glxProxy/glxext.c
View File

@ -1,3 +1,4 @@
/*
** The contents of this file are subject to the GLX Public License Version 1.0 ** 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 ** (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., ** License. You may obtain a copy of the License at Silicon Graphics, Inc.,

2
hw/dmx/glxProxy/glxscreens.c
View File

@ -47,8 +47,6 @@
#include "glxserver.h" #include "glxserver.h"
#include <xf86_ansic.h>
#include <windowstr.h> #include <windowstr.h>
#include "glxfbconfig.h" #include "glxfbconfig.h"