www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 2bb1daba14084ef422c99ad3af9ae0e6353ec9c9
parent 32dfe4070256e7508690e915e906bcd9bb4bb9f6
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Mon, 23 May 2011 17:31:47 +0200

Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable

Conflicts:
	presentation/presentation.tex

Diffstat:
Mpresentation/presentation.tex | 13++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/presentation/presentation.tex b/presentation/presentation.tex @@ -14,6 +14,18 @@ \institute{Université Montpellier II, Département informatique} \date{Lundi, 23 mai 2011} +\defbeamertemplate*{footline}{shadow theme} +{% + \leavevmode% + \hbox{\begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm plus1fil,rightskip=.3cm]{author in head/foot}% + \usebeamerfont{author in head/foot}\insertframenumber\,/\,\inserttotalframenumber\hfill\url{http://pticlic.fr/} + \end{beamercolorbox}% + \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}% + \usebeamerfont{title in head/foot}\insertshorttitle% + \end{beamercolorbox}}% + \vskip0pt% +} + \begin{document} \begin{frame} @@ -313,5 +325,4 @@ Avez-vous des questions~? \end{tikzpicture} \end{frame} - \end{document}