Merge branch 'master' into proposed_master

e0dcb3f9 · Matthieu Cattin · 4a430afa · 5fd1a8b1 · e0dcb3f9
Commit e0dcb3f9 authored 10 years ago by Matthieu Cattin
--- a/Manifest.py
+++ b/Manifest.py
-modules = {"local" : ["hdl/gn4124core/rtl"]}
+if target=="xilinx":
+  modules = {"local" : ["hdl/gn4124core/rtl"]}