projects / matthijs / master-project / cλash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b0ce30 f2ce393)
Merge git://github.com/darchon/clash into cλash
authorMatthijs Kooijman <m.kooijman@student.utwente.nl>
Fri, 3 Jul 2009 11:27:57 +0000 (13:27 +0200)
committerMatthijs Kooijman <m.kooijman@student.utwente.nl>
Fri, 3 Jul 2009 11:27:57 +0000 (13:27 +0200)
commitc8034ff49822eb6e0e0696f288e20e49a1b9af6e
treeff224b3bb4ad7c8aeeba0cd0d5ffdf110ee9132ftree | snapshot
parent3b0ce3044e2c62906a4b26cd7e1b004fea88c21ecommit | diff
parentf2ce393c85a9ccb673f8ba2df12b7c5b649c3a34commit | diff
Merge git://github.com/darchon/clash into cλash

* git://github.com/darchon/clash:
  Keys for typemap can now deal with vector lengths based on type operators

Conflicts:
Generate.hs
VHDLTools.hs
Generate.hs diff1 | diff2 | blob | history
VHDLTools.hs diff1 | diff2 | blob | history
VHDLTypes.hs diff1 | diff2 | blob | history
The Cλash compiler