changeset 364:df4a5c5570e7 default tip

some personal tweaks
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 19 Dec 2012 15:35:01 -0500
parents 7788b512c5bd
children
files mercurial.tex mg.tex
diffstat 2 files changed, 38 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial.tex
+++ b/mercurial.tex
@@ -29,8 +29,8 @@
 
 \include{features}
 \include{mercurial-users}
-%\include{openoffice}
-%\include{testimonials}
+\include{openoffice}
+\include{testimonials}
 
 \subsection{Centralized vs Distributed}
 
@@ -74,25 +74,25 @@
 
 \include{extensions}
 \include{rebase}
-\include{mq}
+%\include{mq}
 \include{histedit}
 
-%\subsection{Talking to Other Systems}
+\subsection{Talking to Other Systems}
 
-%\include{convert}
-%\include{hgsubversion}
-%\include{hg-git}
+\include{convert}
+%x\include{hgsubversion}
+\include{hg-git}
 
-%\subsection{Third-Party Tools}
+\subsection{Third-Party Tools}
 
-%\include{third-party-tools}
-%\include{tortoisehg}
-%\include{machg}
-%\include{mercurialeclipse}
+\include{third-party-tools}
+\include{tortoisehg}
+\include{machg}
+\include{mercurialeclipse}
 %\include{hgsccpackage}
 
-%\section{Demonstration}
-%\include{demo}
+\section{Demonstration}
+\include{demo}
 
 \section{Comparison with Git}
 
@@ -107,10 +107,10 @@
 \include{contributors}
 
 
-%\appendix
-%\newcounter{finalframe}
-%\setcounter{finalframe}{\value{framenumber}}
-%
+\appendix
+\newcounter{finalframe}
+\setcounter{finalframe}{\value{framenumber}}
+
 %\section{Performance Study: OpenOffice}
 %
 %\include{openoffice}
@@ -125,25 +125,25 @@
 %\include{model}
 %\include{immutable-history}
 %
-%\section{Using History}
-%
-%\include{annotate}
-%\include{grep}
-%\include{bisect}
-%
-%\section{Changing History}
-%
-%\include{rebase}
-%\include{mq}
-%\include{histedit}
-%
-%\section{Talking to Other Systems}
-%
-%\include{convert}
-%\include{hgsubversion}
-%\include{hg-git}
-%
-%\setcounter{framenumber}{\value{finalframe}}
+% \section{Using History}
+
+% \include{annotate}
+% \include{grep}
+% \include{bisect}
+
+% \section{Changing History}
+
+% \include{rebase}
+% \include{mq}
+% \include{histedit}
+
+% \section{Talking to Other Systems}
+
+% \include{convert}
+% \include{hgsubversion}
+% \include{hg-git}
+
+\setcounter{framenumber}{\value{finalframe}}
 
 \end{document}
 
--- a/mg.tex
+++ b/mg.tex
@@ -1,4 +1,4 @@
-\begin{frame}{About the Speaker}
+\begin{frame}{About the Speaker Jordi stole these slides from}
   Martin Geisler:
   \begin{itemize}
   \item core Mercurial developer: