diff options
| author | Stephane Caron <stephane.caron@ens.fr> | 2012-05-25 14:11:24 -0700 |
|---|---|---|
| committer | Stephane Caron <stephane.caron@ens.fr> | 2012-05-25 14:11:24 -0700 |
| commit | 0865a1b0e5f975d95cf570027fa5116b6ed8c7d2 (patch) | |
| tree | 7e64f9797b02f40459e5f39ad6d412ed47418c86 /workshop.tex | |
| parent | e5313fb23cdda110bde60b2ed181a197beca1384 (diff) | |
| download | git_workshop-0865a1b0e5f975d95cf570027fa5116b6ed8c7d2.tar.gz | |
including figures in slides
Diffstat (limited to 'workshop.tex')
| -rw-r--r-- | workshop.tex | 28 |
1 files changed, 28 insertions, 0 deletions
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} |
