# HG changeset patch
# User Tobias Gurdan <tobias@gurdan.de>
# Date 1367324538 -7200
# Node ID 42bbfeddf8e9d108f50f2800ac5b6ac3dbde4122
# Parent  8563d7da297e13702cdfe1cd3e1d93cf9dcfe31d# Parent  20c64dea84fa41fbf33b272b81550d23480e73cd
merge

diff -r 20c64dea84fa -r 42bbfeddf8e9 links.txt
--- a/links.txt	Tue Apr 30 02:17:20 2013 +0200
+++ b/links.txt	Tue Apr 30 14:22:18 2013 +0200
@@ -1,5 +1,8 @@
-Theory of Computation, Youtube:
-http://www.youtube.com/watch?v=HyUK5RAJg1c
-
-Theory of Computation, Website:
-http://www.aduni.org/courses/theory/?view=cw
\ No newline at end of file
+Theory of Computation, Youtube:
+http://www.youtube.com/watch?v=HyUK5RAJg1c
+
+Theory of Computation, Website:
+http://www.aduni.org/courses/theory/?view=cw
+
+Carlos Camino (SS12):
+http://www.carlos-camino.de/theo.html
\ No newline at end of file