From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 8 Dec 2008 15:03:29 +0000 (+0000)
Subject: fix conflict breakage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8a1b31ddf39f0b09eb85653cebb9808a5daf0a9;p=mesa.git

fix conflict breakage
---

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index ce82468168d..488a4e99513 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -189,9 +189,6 @@ trirast.o: trirast.c extfuncs.h shaderutil.h
 	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 
 trirast: trirast.o shaderutil.o
-<<<<<<< HEAD:progs/glsl/Makefile
-	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
-=======
 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 
 
@@ -201,7 +198,6 @@ vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
 vert-tex: vert-tex.o shaderutil.o
 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
 
->>>>>>> origin/master:progs/glsl/Makefile