From 0865a1b0e5f975d95cf570027fa5116b6ed8c7d2 Mon Sep 17 00:00:00 2001
From: Stephane Caron <stephane.caron@ens.fr>
Date: Fri, 25 May 2012 14:11:24 -0700
Subject: including figures in slides

---
 workshop.tex | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'workshop.tex')

diff --git a/workshop.tex b/workshop.tex
index b404490..c798a16 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -25,4 +25,32 @@
 ...
 \end{frame}
 
+\begin{frame}
+\begin{center}
+\includegraphics[scale=.9]{figures/overview.pdf}
+\end{center}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-push.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-pull.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-pull-2.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-merge-ok.pdf}
+\end{frame}
+
+\begin{frame}
+\begin{center}
+\includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
+\end{center}
+\end{frame}
+
 \end{document}
-- 
cgit v1.2.3-70-g09d2

