projects / matthijs / master-project / cλash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc592bd 04de894)
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)
* '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

1  2 
cλash/CLasH/Translator.hs patch | diff1 | diff2 | blob | history

diff --cc cλash/CLasH/Translator.hs
Simple merge
The Cλash compiler