diff options
Diffstat (limited to 'src/glx/x11/Makefile')
| -rw-r--r-- | src/glx/x11/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 8d49a174e8f..0bb2dc10d14 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -51,7 +51,10 @@ 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) \ |