# HG changeset patch
# User Tommaso Pecorella <tommaso.pecorella@unifi.it>
# Date 1273324868 -7200
# Node ID 8ed461c829494fe01e01e1556e65d41efbd3d67a
# Parent  68081ad44dffcda77fbac61b5e4fb33e75a43e88
# Parent  c09d89674da47f1982f3815031319d05053f423b
merge

diff -r 68081ad44dffcda77fbac61b5e4fb33e75a43e88 -r 8ed461c829494fe01e01e1556e65d41efbd3d67a .hgignore
--- a/.hgignore	Sat May 08 15:16:44 2010 +0200
+++ b/.hgignore	Sat May 08 15:21:08 2010 +0200
@@ -19,6 +19,8 @@
 *.log
 *.nav
 ipv6.*.pdf
+presentazione.pdf
+duemiladodici.pdf
 *.synctex.gz
 *.snm
 *.toc
@@ -27,4 +29,4 @@
 *.dvi
 
 syntax: regexp
-.*\#.*\#$
\ No newline at end of file
+.*\#.*\#$
diff -r 68081ad44dffcda77fbac61b5e4fb33e75a43e88 -r 8ed461c829494fe01e01e1556e65d41efbd3d67a images/20061108.png
Binary file images/20061108.png has changed
diff -r 68081ad44dffcda77fbac61b5e4fb33e75a43e88 -r 8ed461c829494fe01e01e1556e65d41efbd3d67a introduzione.tex
--- a/introduzione.tex	Sat May 08 15:16:44 2010 +0200
+++ b/introduzione.tex	Sat May 08 15:21:08 2010 +0200
@@ -34,7 +34,7 @@
 \end{frame}
 
 \begin{frame}[plain,t]%\frametitle{Allocazione IPv4}
-  \includegraphics[scale=.065]{20061108}
+  \includegraphics[scale=.5]{20061108}
 \end{frame} 
 
 \subsection{Timeline di IPv6}