X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=main.tex;h=7906b9cecae7edeec8d4b85b3659c357408ceb2d;hb=refs%2Fheads%2Fmaster;hp=1124daafd8505451df2e00aed6e877ec4a57f12f;hpb=166ab37d28f212317932a9b96ad094983ad5ea32;p=talk-dvcs-git.git

diff --git a/main.tex b/main.tex
index 1124daa..7906b9c 100644
--- a/main.tex
+++ b/main.tex
@@ -1,3 +1,29 @@
+%
+% Copyright (C) 2010-2011 Sebastian 'tokkee' Harl <sh@tokkee.org>
+% All rights reserved.
+%
+% Redistribution and use in source and binary forms, with or without
+% modification, are permitted provided that the following conditions
+% are met:
+% 1. Redistributions of source code must retain the above copyright
+%    notice, this list of conditions and the following disclaimer.
+% 2. Redistributions in binary form must reproduce the above copyright
+%    notice, this list of conditions and the following disclaimer in the
+%    documentation and/or other materials provided with the distribution.
+%
+% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+% TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+% PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+% CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+% EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+% PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+% OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+% OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%
+
 \usetheme{default}
 \setbeamertemplate{navigation symbols}{}
 
@@ -752,6 +778,7 @@ would print garbage (if you are lucky) or crash. This fixes it.
     \item \texttt{gitk} (Tk, read-only)
     \item \texttt{qgit} (Qt)
     \item \texttt{magit} (emacs)
+    \item \texttt{egit} (Eclipse)
   \end{itemize}
 \end{frameframe}