# HG changeset patch
# User Christian Urban <urbanc@in.tum.de>
# Date 1328027214 0
# Node ID 47794dcaac00e567ba65f0e43b7931be0e9c70eb
# Parent  f58a4b0033634725a105ae1a1223b7e828c7ea0b# Parent  001a643b8b06f4a441be6b3fbf6952d1c7845bce
merged

diff -r f58a4b003363 -r 47794dcaac00 projects.html
--- a/projects.html	Tue Jan 31 16:26:02 2012 +0000
+++ b/projects.html	Tue Jan 31 16:26:54 2012 +0000
@@ -298,6 +298,18 @@
   </table>
   </p>
 
+<li><h4>[CU8] Webserver for a Revision Control System</h4>
+
+  <p>
+    Modern revision control systems are
+    <A HREF="http://mercurial.selenic.com/">mercurial</A> and
+    <A HREF="http://git-scm.com/">git</A>.
+  </p>
+
+  <p>
+    <b>Task:</b> Build a webserver for a revision control system 
+    that allows user management. 
+  </p>
 
 </ul>
 </TD>
diff -r f58a4b003363 -r 47794dcaac00 teaching.html
--- a/teaching.html	Tue Jan 31 16:26:02 2012 +0000
+++ b/teaching.html	Tue Jan 31 16:26:54 2012 +0000
@@ -37,7 +37,7 @@
 <TD BGCOLOR="#FFFFFF" 
     WIDTH="24%" 
     VALIGN="TOP" 
-    ROWSPAN="13">
+    ROWSPAN="14">
 
 <B>Links</B><BR>
 <A HREF="http://www.inf.kcl.ac.uk/staff/urbanc/">Home</A><BR>
@@ -89,7 +89,10 @@
 (the paper coming out of this work was presented at CADE)</li>
 <li><A HREF="http://www.lsv.ens-cachan.fr/~arnaud">Mathilde Arnaud</A> 
 (2007, ENS Cachan, France) Formalization of Generative Unbinding</li>
-<li>Parminder Sandhu (2011-2012, King's) Parsing using Derivatives</li>
+<li>Akhil Junghare (2011-2012, King's) Lexing and Parsing using Derivatives</li>
+<li>Darius Hodei (2011-2012, King's) A Compiler for System F</li>
+<li>Jian Jiang (2011-2012, King's) Suffix Array Sorting</li>
+<li>Adnan Noureddine (2011-2012, King's) Equivalence Checking of Regular Expressions</li>
 </ul>
 
 </TD>
@@ -97,12 +100,27 @@
 
 <TR>
 <TD BGCOLOR="#FFFFFF" WIDTH="75%">
+<H3>2012-2013</H3>
+
+<ul>
+<li>Automata and Formal Languages course
+</ul>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="#FFFFFF" WIDTH="75%">
 <H3>2011-2012</H3>
 
-<p><B>Autumn</B> 
+<p><B>Autumn</B>
 <ul>
 <li>Course on Access Control and Privacy Policies (at King's; original course by Steve Barker)
 </ul>
+<p><B>Spring</B>
+<ul>
+<li>Help Steffen Zschaler with the Programming Application course; I
+am resposible for the exercises and the Scala part
+</ul>
 </TD>
 </TR>
 
diff -r f58a4b003363 -r 47794dcaac00 travelling.html
--- a/travelling.html	Tue Jan 31 16:26:02 2012 +0000
+++ b/travelling.html	Tue Jan 31 16:26:54 2012 +0000
@@ -64,6 +64,7 @@
 <TD BGCOLOR="#FFFFFF" WIDTH="75%">
 <H2>Talks and Travel Plans</H2>
 <ul class="striped">
+<li> Talk at the Nominal Sets Meet Automata Theory Workshop (9 - 10 February)
 <li> Talk in Edinburgh (21 February, host: Dr James Cheney)
 </ul>
 </TD>