From: Matthijs Kooijman <m.kooijman@student.utwente.nl>
Date: Fri, 31 Jul 2009 09:26:59 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/christiaanb/clash into cλash
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fc%CE%BBash.git;a=commitdiff_plain;h=4b87be0b9d499155084a6240b016afd57b4b30cd

Merge branch 'master' of git://github.com/christiaanb/clash into cλash

* 'master' of git://github.com/christiaanb/clash:
  Quick hack implementation of FSVec literals, needs to be fixed
  We need the latest vhdl package
  We now make a show function for all default datatypes.
  Add automated testbench generation according to supplied test input

Conflicts:
	cλash/CLasH/Translator.hs
---

4b87be0b9d499155084a6240b016afd57b4b30cd