Merge branch 'no_regular' into equiv
authorAnders <mortberg@chalmers.se>
Thu, 18 Jun 2015 14:44:49 +0000 (16:44 +0200)
committerAnders <mortberg@chalmers.se>
Thu, 18 Jun 2015 14:44:49 +0000 (16:44 +0200)
commit9125aca569f121bfc73d83012ed1ec6c79367fda
tree901f6f301f6fd25b353a31f23ef478d6e78b7dd9
parent3cec7197307b54c8483382f782d6955c51eb5b0a
parent75e006b6ea7a65a664ddaa6d451de84774f88dfd
Merge branch 'no_regular' into equiv

# Conflicts:
# CTT.hs
# Eval.hs
CTT.hs
Eval.hs