Merge branch 'master' of git://github.com/christiaanb/clash into cλash
authorMatthijs Kooijman <m.kooijman@student.utwente.nl>
Fri, 31 Jul 2009 09:26:59 +0000 (11:26 +0200)
committerMatthijs Kooijman <m.kooijman@student.utwente.nl>
Fri, 31 Jul 2009 09:26:59 +0000 (11:26 +0200)
commit4b87be0b9d499155084a6240b016afd57b4b30cd
treefd67f808ae4113ed6838cf3d95259f3fee162d37
parentbc592bd13167eac05619653e84857ee7ab5035c1
parent04de89474351850ea9dca0350fa383f1b2aff8ea
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
cλash/CLasH/Translator.hs