From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Tue, 12 Apr 2011 23:16:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
X-Git-Tag: snapshot-20110506-0930~59
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=a6dcf0f3abbe0238c0af5238e2ff7280da4c88da;hp=45ddfdc2fc6898836012366b2d4dc647b57f85f0;p=test%2Ftestrepo.git

Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 6b9fd0d..523e335 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,5 +1,7 @@
 Blabol
 
+Druhy blabol :-) :-O :-)
+
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
diff --git a/tucnak.txt b/tucnak.txt
index 99a7b72..f3846a9 100644
--- a/tucnak.txt
+++ b/tucnak.txt
@@ -1,2 +1,35 @@
 Mame doma blechu, raz dva tri.
 
+Tučňák je nejlepší. :-)
+Tučnák!!!
+
+A není toto už nějaká úchylka? A sponzorujete nějakého v ZOO?
+
+Tučňáci ve Zlínské ZOO:
+http://www.zoozlin.eu/cz/zvirata-a-expozice/zvirata.html?zvire=tucnak-humboldtuv
+
+http://www.zoozlin.eu/cz/sponzorstvi/
+
+
+             .888888:.
+             88888.888.
+            .8888888888
+            8' `88' `888
+            8 8 88 8 888
+            8:.,::,.:888
+           .8`::::::'888
+           88  `::'  888
+          .88        `888.
+        .88'   .::.  .:8888.
+        888.'   :'    `'88:88.
+      .8888'    '        88:88.
+     .8888'     .        88:888
+     `88888     :        8:888'
+      `.:.88    .       .::888'
+     .:::::88   `      .:::::::.
+    .::::::.8         .:::::::::
+    :::::::::..     .:::::::::'
+     `:::::::::88888:::::::'
+        rs`:::'       `:'
+
+
diff --git a/tux.txt b/tux.txt
new file mode 100644
index 0000000..2c4f762
--- /dev/null
+++ b/tux.txt
@@ -0,0 +1,20 @@
+         _nnnn_        
+        dGGGGMMb       
+       @p~qp~~qMb      
+       M|@||@) M|      
+       @,----.JM|      
+      JS^\__/  qKL     
+     dZP        qKRb   
+    dZP          qKKb  
+   fZP            SMMb 
+   HZM            MMMM 
+   FqM            MMMM 
+ __| ".        |\dS"qML
+ |    `.       | `' \Zq
+_)      \.___.,|     .'
+\____   )MMMMMP|   .'  
+     `-'       `--' hjm
+
+U                         U
+U                         U
+UUUUUUUUUUUUUUUUUUUUUUUUUUU
diff --git a/tux2.txt b/tux2.txt
new file mode 100644
index 0000000..a444e32
--- /dev/null
+++ b/tux2.txt
@@ -0,0 +1,17 @@
+         _nnnn_        
+        dGGGGMMb       
+       @p~qp~~qMb      
+       M|@||@) M|      
+       @,----.JM|      
+      JS^\__/  qKL     
+     dZP        qKRb   
+    dZP          qKKb  
+   fZP            SMMb 
+   HZM            MMMM 
+   FqM            MMMM 
+ __| ".        |\dS"qML
+ |    `.       | `' \Zq
+_)      \.___.,|     .'
+\____   )MMMMMP|   .'  
+     `-'       `--' hjm
+