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

---
 figures/overview.pdf | Bin 24549 -> 24555 bytes
 figures/overview.svg |  41 ++++++++---------------------------------
 workshop.tex         |  28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/figures/overview.pdf b/figures/overview.pdf
index 2c37a60..9812fd1 100644
Binary files a/figures/overview.pdf and b/figures/overview.pdf differ
diff --git a/figures/overview.svg b/figures/overview.svg
index 0301731..e489adf 100644
--- a/figures/overview.svg
+++ b/figures/overview.svg
@@ -20,38 +20,13 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4832">
-      <stop
-         style="stop-color:#c4c9e1;stop-opacity:1;"
-         offset="0"
-         id="stop4834" />
-      <stop
-         style="stop-color:#c4c9e1;stop-opacity:0;"
-         offset="1"
-         id="stop4836" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4824">
-      <stop
-         style="stop-color:#c4c9e1;stop-opacity:1;"
-         offset="0"
-         id="stop4826" />
-      <stop
-         style="stop-color:#c4c9e1;stop-opacity:0;"
-         offset="1"
-         id="stop4828" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4816">
       <stop
          style="stop-color:#c4c9e1;stop-opacity:1;"
          offset="0"
          id="stop4818" />
       <stop
-         style="stop-color:#c4c9e1;stop-opacity:0;"
+         style="stop-color:#3f3c77;stop-opacity:0.62234044;"
          offset="1"
          id="stop4820" />
     </linearGradient>
@@ -136,7 +111,7 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4824"
+       xlink:href="#linearGradient4816"
        id="linearGradient4830"
        x1="205.20284"
        y1="846.85034"
@@ -145,7 +120,7 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4832"
+       xlink:href="#linearGradient4816"
        id="linearGradient4838"
        x1="346.93512"
        y1="846.85034"
@@ -161,10 +136,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2"
-     inkscape:cx="211.34198"
+     inkscape:cx="129.34198"
      inkscape:cy="-2.5660255"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g4748"
      inkscape:window-width="1920"
      inkscape:window-height="1145"
      inkscape:window-x="-2"
@@ -230,7 +205,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -271,7 +246,7 @@
          height="42.519714"
          width="99.212608"
          id="rect2995-4"
-         style="fill:url(#linearGradient4830);fill-opacity:1;stroke:#000000;stroke-width:0.61791009;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:url(#linearGradient4830);fill-opacity:1.0;stroke:#000000;stroke-width:0.61791008999999997;stroke-miterlimit:4;stroke-opacity:0.36529678999999998;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
          sodipodi:linespacing="125%"
          id="text3037"
@@ -294,7 +269,7 @@
          height="42.519714"
          width="99.21257"
          id="rect2995-4-5"
-         style="fill:url(#linearGradient4838);fill-opacity:1;stroke:#000000;stroke-width:0.61790997;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:url(#linearGradient4838);fill-opacity:1.0;stroke:#000000;stroke-width:0.61790997000000003;stroke-miterlimit:4;stroke-opacity:0.36529678999999998;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
          sodipodi:linespacing="125%"
          id="text3041"
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