Merge branch 'master' of http://git.stderr.nl/matthijs/master-project/cλash
authorChristiaan Baaij <baaijcpr@wlan233104.mobiel.utwente.nl>
Thu, 25 Mar 2010 08:52:36 +0000 (09:52 +0100)
committerChristiaan Baaij <baaijcpr@wlan233104.mobiel.utwente.nl>
Thu, 25 Mar 2010 08:52:36 +0000 (09:52 +0100)
commit6a943c79c8f7d6247e0b3336046b8a41c88e72f1
treef7a66798e955c883ecc271a59de34b4482c5fe48
parente9462bb7914eb28bea85f13383e0224802187fda
parent39c7a90c464192797000b109ad6c90154f2ff3ea
Merge branch 'master' of git.stderr.nl/matthijs/master-project/cλash

Conflicts:
cλash/CLasH/Normalize.hs
cλash/CLasH/Normalize/NormalizeTools.hs
cλash/CLasH/Normalize.hs
cλash/CLasH/VHDL/Constants.hs
cλash/CLasH/VHDL/Generate.hs