projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
[mesa.git]
/
src
/
glx
/
x11
/
Makefile
diff --git
a/src/glx/x11/Makefile
b/src/glx/x11/Makefile
index 0bb2dc10d149e8415e02c7d3fe29b51c90a48f40..86d84d4b9ff4bf8df4103b7bca11d2bbcba0d4a8 100644
(file)
--- a/
src/glx/x11/Makefile
+++ b/
src/glx/x11/Makefile
@@
-51,10
+51,6
@@
INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
-<<<<<<< HEAD:src/glx/x11/Makefile
- -I$(TOP)/src/mesa/main \
-=======
->>>>>>> master:src/glx/x11/Makefile
-I$(TOP)/src/mesa/glapi \
$(LIBDRM_CFLAGS) \
$(DRI2PROTO_CFLAGS) \