Permalink
Browse files

Merge branch 'master' of https://github.com/c3d2/cms-datenspuren2012

  • Loading branch information...
2 parents efd820e + ded0c28 commit 3bcaf62e3a96c19ce0508dd434165ced52235f02 Marius Melzer committed Oct 11, 2012
Showing with 12 additions and 4 deletions.
  1. BIN img/by-nc-sa.png
  2. BIN img/computer_dog.jpg
  3. +12 −4 src/slides.tex
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -39,31 +39,39 @@ \section{Einleitung}
\section{Problematik}
\begin{frame}
- \frametitle{Einleitung}
+ \frametitle{Problematik}
\begin{figure}
\includegraphics[height=0.7\textheight]{img/computer_alt.jpg}
\license[http://rchrd.com/weblog/archives/archive\_2005-m03.php]{\cc{by-nc-nd}}
\end{figure}
\end{frame}
\begin{frame}
- \frametitle{Einleitung}
+ \frametitle{Problematik}
\begin{figure}
\includegraphics[height=0.7\textheight]{img/computer_senior.jpg}
\license[http://www.flickr.com/photos/33346162@N07/3113651122/]{\cc{by-nc-nd}}
\end{figure}
\end{frame}
\begin{frame}
- \frametitle{Einleitung}
+ \frametitle{Problematik}
\begin{figure}
\includegraphics[height=0.7\textheight]{img/computer_katze.jpg}
\license[http://www.flickr.com/photos/sbisson/2285110239/]{\cc{by-nc-nd}}
\end{figure}
\end{frame}
\begin{frame}
- \frametitle{Einleitung}
+ \frametitle{Problematik}
+ \begin{figure}
+ \includegraphics[height=0.7\textheight]{img/computer_dog.jpg}
+ \license[http://www.flickr.com/photos/konszvi/4218539270/]{\cc{by-nc-sa}}
+ \end{figure}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Problematik}
\begin{figure}
\includegraphics[height=0.7\textheight]{img/computer_olpc.jpg}
\license[http://www.fotopedia.com/items/flickr-2606362543]{\cc{by}}

0 comments on commit 3bcaf62

Please sign in to comment.