fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 04:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

swrast: remove merge droppings

Browse source
This commit is contained in:
Keith Whitwell 2008-09-21 12:09:12 -07:00
parent 00929157de
commit 53dd838de6
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/sources
View file

@ -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