diff options
| author | Eric Anholt <eric@anholt.net> | 2007-06-21 14:14:24 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-06-21 14:14:24 -0700 |
| commit | 4fe48b4e8568896cdbc822323aeec0a41c72ff2a (patch) | |
| tree | a32edaa514931bad2364b3877302eeaa3847131e /src/mesa/drivers/x11/xm_api.c | |
| parent | 5d9dc02cbecd94f822f853fd01878784596f4eba (diff) | |
| parent | ed5ed6fe2f64f45eb3a43f9c57037d9e9b7fa5ea (diff) | |
Merge branch 'origin' into i915-unification
Diffstat (limited to 'src/mesa/drivers/x11/xm_api.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_api.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index cff64d17ad..eaa277db4a 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -63,7 +63,6 @@ #endif #include "glxheader.h" -#include "GL/glxtokens.h" #include "GL/xmesa.h" #include "xmesaP.h" #include "context.h" |