Changeset 239 for trunk/subversion

Timestamp:

09/14/09 12:36:56 (15 years ago)

Author:

nanardon

Message:

• add box

File:

• trunk/subversion/subversion.tex (modified) (2 diffs)

trunk/subversion/subversion.tex

@@ -474 +474 @@
 \end{frame}
 
+<<<<<<< .courant
 \begin{frame}[fragile]
 \frametitle{Gérer les conflits}
@@ -524 +525 @@
     \section{Autour de subversion}
 
-    \begin{frame}{tortoisesvn}
-    Client subversion pour Windows
+\begin{frame}{tortoisesvn}
+    \begin{block}{Client subversion pour Windows}
 
     \begin{figure}[htb]
     \includegraphics[height=60mm]{tortoisesvn}
     \end{figure}
-    
-    \end{frame}
+    \end{block}
+    
+\end{frame}
 
     \begin{frame}{viewcvs}