projects / matthijs / master-project / cλash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adf357a 6845297)
Merge branch 'master' of git://github.com/christiaanb/clash into cλash
authorMatthijs Kooijman <m.kooijman@student.utwente.nl>
Wed, 5 Aug 2009 15:10:41 +0000 (17:10 +0200)
committerMatthijs Kooijman <m.kooijman@student.utwente.nl>
Wed, 5 Aug 2009 15:10:41 +0000 (17:10 +0200)
commitd42006e5be8a3d6e3970b84767856b77d00f7f73
treeb8fe9c552491e7ea1c425001b00dff0ec7203398tree | snapshot
parentadf357ab8731531dfea0a21254cfc613031e083acommit | diff
parent68452976b782fcf291a678330ca3a9703e8c7c35commit | diff
Merge branch 'master' of git://github.com/christiaanb/clash into cλash

* 'master' of git://github.com/christiaanb/clash:
  Fix builtin functions (!),take and RangedWord

Conflicts:
cλash/CLasH/VHDL/Generate.hs
cλash/CLasH/VHDL/Generate.hs diff1 | diff2 | blob | history
The Cλash compiler