Merge branch 'compU'
authorAnders Mörtberg <andersmortberg@gmail.com>
Thu, 31 Dec 2015 07:54:15 +0000 (08:54 +0100)
committerAnders Mörtberg <andersmortberg@gmail.com>
Thu, 31 Dec 2015 07:54:15 +0000 (08:54 +0100)
commit877c83ddfb78f28c27556f0c0c35d53b81425df7
treee8fbb4b69d4045091687fa7a95c475e3d0c1074b
parentf2a56ccbcdb73e74c756179aa65f0d0524d3bab4
parentb72fc4238acab69838be5967e3ab88597c132b65
Merge branch 'compU'

# Conflicts:
# CTT.hs
# Eval.hs
# examples/testEquiv.ctt
CTT.hs
Eval.hs
examples/prelude.ctt