diff options
| author | Alan Hourihane <[email protected]> | 2008-12-08 15:03:29 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-08 15:03:29 +0000 |
| commit | e8a1b31ddf39f0b09eb85653cebb9808a5daf0a9 (patch) | |
| tree | ed3d2a8ac865f1c697bb0ba9e43e02a9640136b8 | |
| parent | 33a1f495d4bb19288680b9812c6ec1235302d215 (diff) | |
fix conflict breakage
| -rw-r--r-- | progs/glsl/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
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 |