Merge branch 'hisoproj' into no_regular
authorSimon Huber <hubsim@gmail.com>
Fri, 5 Jun 2015 13:56:59 +0000 (15:56 +0200)
committerSimon Huber <hubsim@gmail.com>
Fri, 5 Jun 2015 13:56:59 +0000 (15:56 +0200)
commit2b39f0db456574e91fa69211c2e8803092ed8822
tree1e154dc79733bf52057e3cab594f4c50ef9c3671
parentd5d1c9d8cccddafb79c1e424a0fcfd740ab0bfac
parent6cf058d8c6eefbb66bb99cd8d7ad4f30575fe8ed
Merge branch 'hisoproj' into no_regular

Conflicts:
Eval.hs
Eval.hs
examples/prelude.ctt