Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
authorChristiaan Baaij <christiaan.baaij@gmail.com>
Fri, 19 Jun 2009 11:25:24 +0000 (13:25 +0200)
committerChristiaan Baaij <christiaan.baaij@gmail.com>
Fri, 19 Jun 2009 11:25:24 +0000 (13:25 +0200)
commit8a17f35807fb35ee4d2a4c35c75e1cf99066f94d
tree9b111fa3a9bc2bf1360c400a0a446aa4ffb2cab3
parentff9a8487475aa90d2f212fd24169503993a4a27d
parenteb3177ed5e53fd27bc64a45584ab646545c27e5f
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project

* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
  Add another higher order testcase, highordtest2.
  Support VHDL generation for two-alternative cases.

Conflicts:
Translator.hs
Adders.hs
Translator.hs
VHDL.hs