From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 10 Oct 2016 17:45:20 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.science:mlubbers/ssproject1617
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6e5db13cb9fd5b7bb29f9cff186e0d0046affa98;p=ssproject1617.git

Merge branch 'master' of gitlab.science:mlubbers/ssproject1617
---

6e5db13cb9fd5b7bb29f9cff186e0d0046affa98
diff --cc report/Makefile
index a4ec3a0,9426ffd..9ba9f50
--- a/report/Makefile
+++ b/report/Makefile
@@@ -20,9 -19,6 +19,6 @@@ all: $(DOC).pd
  	grep -qF 'Please rerun LaTeX.' $(basename $<).mlog &&\
  		$(LATEX) $(LATEXFLAGS) $< || true
  
- %.png: %.eps
- 	convert -density 300 $< -resize x1000 $@
- 
  clean:
 -	$(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf)\
 +	$(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf out)\
  		$(DOC)-blx.bib logo.png