projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 33a1f49)
fix conflict breakage
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 15:03:29 +0000 (15:03 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 15:03:29 +0000 (15:03 +0000)
progs/glsl/Makefile patch | blob | history

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index ce82468168d40b6c5e67f503823c03bb80760c1c..488a4e99513ac977518718d31146cd0082f24890 100644 (file)
--- 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