# HG changeset patch
# User Christian Urban <urbanc@in.tum.de>
# Date 1490280566 0
# Node ID acd8780bfc8b862844d15757aed407464339f596
# Parent  9e42ccbbd1e65f1cc9ac65820a17291c183fa7a8# Parent  52aa298211f69c59f3f4211c66f7cec1b19c13d9
merged

diff -r 9e42ccbbd1e6 -r acd8780bfc8b handouts/ho02.tex
diff -r 9e42ccbbd1e6 -r acd8780bfc8b progs/dfa.scala
diff -r 9e42ccbbd1e6 -r acd8780bfc8b progs/re1.scala