# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1328113475 -3600
# Node ID 89dd1a91e52b280d0da3eae51fae3bd334e71743
# Parent  f230d3e2e203ceae6606c580807cb0c643ec90d9
Updated title for ClearCase conference

diff --git a/mercurial.tex b/mercurial.tex
--- a/mercurial.tex
+++ b/mercurial.tex
@@ -1,10 +1,10 @@
 \documentclass[t,noamsthm,xcolor=dvipsnames]{beamer}
 \input{preambel}
-\title{Modern Revision Control with Mercurial}
+\title{Distributed Version Control with Mercurial}
 \author{Martin Geisler
   \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
                  {<mg@aragost.com>}}
-\date{Gearconf, Düsseldorf\\June 9th, 2011}
+\date{ClearCase in the 21st Century, Zurich\\February 3rd, 2012}
 
 \begin{document}
 
@@ -34,7 +34,7 @@
 
 \include{features}
 \include{mercurial-users}
-\include{openoffice}
+%\include{openoffice}
 %\include{testimonials}
 
 \subsection{Key Mercurial Concepts}
@@ -96,10 +96,10 @@
 %\section{Demonstration}
 %\include{demo}
 
-%\section{Comparison with Git}
-%
-%\include{git}
-%\include{git-branches}
+\section{Comparison with Git}
+
+\include{git}
+\include{git-branches}
 
 \section{Wrapping Up}
 
@@ -113,9 +113,9 @@
 \newcounter{finalframe}
 \setcounter{finalframe}{\value{framenumber}}
 
-%\section{Performance Study: OpenOffice}
+\section{Performance Study: OpenOffice}
 
-%\include{openoffice}
+\include{openoffice}
 
 \section{Subversion and Branches}