summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormanuel <manuel@nc8430.lan>2009-05-03 17:38:01 +0200
committermanuel <manuel@nc8430.lan>2009-05-03 17:38:01 +0200
commit83ae9633f7fb508f5ccd6293833166b6e7eb3a70 (patch)
treee9173e7d314b76a396eff879e8789884004692ba
parentd3d8bb91047907701261debb37acf4b2ac30b389 (diff)
parent960dbee42c67e02528c68162beea7821633ed603 (diff)
downloadooprog-83ae9633f7fb508f5ccd6293833166b6e7eb3a70.tar.gz
ooprog-83ae9633f7fb508f5ccd6293833166b6e7eb3a70.tar.bz2
ooprog-83ae9633f7fb508f5ccd6293833166b6e7eb3a70.zip
merge!!
-rw-r--r--ue1/protokoll/Makefile3
-rw-r--r--ue2/protokoll/protokoll.tex2
2 files changed, 3 insertions, 2 deletions
diff --git a/ue1/protokoll/Makefile b/ue1/protokoll/Makefile
index a56bff6..21e46e7 100644
--- a/ue1/protokoll/Makefile
+++ b/ue1/protokoll/Makefile
@@ -13,7 +13,8 @@ tex:
13 @echo $(PDFFILE)" lala" 13 @echo $(PDFFILE)" lala"
14 @mkdir -p $(TMPDIR) 14 @mkdir -p $(TMPDIR)
15 @$(PDFLATEX) -interaction=nonstopmode -output-directory=$(TMPDIR) $(TEXFILE) 15 @$(PDFLATEX) -interaction=nonstopmode -output-directory=$(TMPDIR) $(TEXFILE)
16 @mv $(TMPDIR)/$(PDFFILE) ../ 16 @$(PDFLATEX) -interaction=nonstopmode -output-directory=$(TMPDIR) $(TEXFILE)
17 @cp $(TMPDIR)/$(PDFFILE) ../
17 @rm -rf $(TMPDIR) 18 @rm -rf $(TMPDIR)
18 19
19# vim600: noet sw=8 ts=8 20# vim600: noet sw=8 ts=8
diff --git a/ue2/protokoll/protokoll.tex b/ue2/protokoll/protokoll.tex
index 1eefbce..5591812 100644
--- a/ue2/protokoll/protokoll.tex
+++ b/ue2/protokoll/protokoll.tex
@@ -9,7 +9,7 @@
9 9
10\author{ 10\author{
11Günther Neuwirth, \matrnr 0626638\\ 11Günther Neuwirth, \matrnr 0626638\\
12 {\small e0626638@student.tuwien.ac.at} 12 {\small e0626638@student.tuwien.ac.at}\\
13Manuel Mausz, \matrnr 0728348\\ 13Manuel Mausz, \matrnr 0728348\\
14 {\small manuel-tu@mausz.at}\\ 14 {\small manuel-tu@mausz.at}\\
15} 15}