# HG changeset patch
# User meillo@marmaro.de
# Date 1182441230 -7200
# Node ID dc88dad3b5afc3a3b2c3cbe569de8cfeb7c36b7b
# Parent  eff2ffb701fe6bcd59d3672015907cde7b10768f
changes to vorstellung; modified Makefile

diff -r eff2ffb701fe -r dc88dad3b5af 00_vorstellung.tex
--- a/00_vorstellung.tex	Thu Jun 21 11:36:57 2007 +0200
+++ b/00_vorstellung.tex	Thu Jun 21 17:53:50 2007 +0200
@@ -20,11 +20,9 @@
 
 
 \title{Design Patterns}
-\author{Markus Rundel,\\ Julian Haug,\\ Markus Schnalke,\\ Dimitar Dimitrov}
+\author{Markus Rundel \\ Julian Haug \\ Markus Schnalke \\ Dimitar Dimitrov}
 \date{\today}
 
-%\titlegraphic{\includegraphics[width=3cm]{Pics/Maka-Logo.png}}
-
 \frame{
   \titlepage
 }
@@ -34,27 +32,33 @@
 
 
 \section[Outline]{}
+
 \frame{
-   \begin{block}{Einführung in Design Patterns}
-   \end{block}
+  \tableofcontents
+}
 
-   \begin{block}{Weitere Patterns}
-   \end{block}
 
-   \begin{block}{Design Pattern ``Observer''}
-   \end{block}
+% the following content gets removed by `make merge'
 
-   \begin{block}{Design Pattern ``Composite''}
-   \end{block}
+\section{Einführung in Design Patterns}
+  \subsubsection{Markus Rundel}
 
-   \begin{block}{Exkurs: Anti-Patterns}
-   \end{block}
+\section{Andere Patterns}
+  \subsubsection{Julian Haug}
 
-   \begin{block}{Zusammenfassung}
-   \end{block}
+\section{Observer-Pattern}
+  \subsubsection{Markus Schnalke}
 
-%  \tableofcontents
-}
+\section{Composite-Pattern}
+  \subsubsection{Dimitar Dimitriv}
+
+\section{Anti-Patterns}
+  \subsubsection{Julian Haug}
+
+\section{Zusammenfassung}
+  \subsubsection{gemeinsam}
+
+  .  % this dot is needed to have the sections displayed
 
 \end{document}
 
diff -r eff2ffb701fe -r dc88dad3b5af Makefile
--- a/Makefile	Thu Jun 21 11:36:57 2007 +0200
+++ b/Makefile	Thu Jun 21 17:53:50 2007 +0200
@@ -15,6 +15,7 @@
 
 merge:
 	rm all.pdf
+	pdftk A=00_vorstellung.pdf cat A1-2 output 00_vorstellung-mod.pdf && rm 00_vorstellung.pdf
 	pdftk *.pdf cat output all.pdf