diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 12:09:12 -0700 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 12:09:12 -0700 |
| commit | 53dd838de6cd455f00f43ef7f733d4e9b420b8d8 (patch) | |
| tree | e595032cc6393e04e7098afbf590b97fdd2b3427 /src/mesa/sources | |
| parent | 00929157de20b4b37a4b2b92a15d775a35e7d11c (diff) | |
swrast: remove merge droppings
Diffstat (limited to 'src/mesa/sources')
| -rw-r--r-- | src/mesa/sources | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/mesa/sources b/src/mesa/sources index 9278ca88e9..9a34d1a989 100644 --- 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 |