projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0092915)
swrast: remove merge droppings
authorKeith Whitwell <keith@tungstengraphics.com>
Sun, 21 Sep 2008 19:09:12 +0000 (12:09 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Sun, 21 Sep 2008 19:09:12 +0000 (12:09 -0700)
src/mesa/sources patch | blob | history

diff --git a/src/mesa/sources b/src/mesa/sources
index 9278ca88e9a571502f5ee40852feeef6f2e3c5a5..9a34d1a989f3f31ad1c298b38039ad133338c8ec 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -299,9 +299,4 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
-<<<<<<< HEAD:src/mesa/sources
        -I$(TOP)/src/mesa
-=======
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main
->>>>>>> master:src/mesa/sources