Merge branch 'master' into risikomanagement

2018-12-23 10:04:25 +01:00 · 2018-12-23 10:04:25 +01:00 · e90dac6e77
parent bb1279ae86 1191275bcb
commit e90dac6e77
5 changed files with 1 additions and 1 deletions
--- a/projekthandbuch/Makefile
+++ b/projekthandbuch/Makefile
@ -45,7 +45,7 @@ clean:  ## Clean LaTeX and output figure files
 	rm -rf general/*.aux
 	rm -f projekthandbuch.tex

-distclean: clean
+distclean:
 	rm -f Projekthandbuch_Andreas_Zweili.pdf

 pictures/%.pdf: pictures/%.svg  ## Figures for the manuscript
--- a/projekthandbuch/pictures/hello_world.png
+++ b/projekthandbuch/pictures/hello_world.png
--- a/raw_files/hello_world/hello_world_screenshots.xcf
+++ b/raw_files/hello_world/hello_world_screenshots.xcf
--- a/raw_files/hello_world/screenshots/Bildschirmfoto
+++ b/raw_files/hello_world/screenshots/Bildschirmfoto
--- a/raw_files/hello_world/screenshots/osx.png
+++ b/raw_files/hello_world/screenshots/osx.png