Skip to content
Snippets Groups Projects
Commit 28e326b0 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files

Merge branch 'switch-v4-merge' 

Conflicts:
	Manifest.py
	ip_cores/general-cores
	modules/wrsw_nic/nic_tx_fsm.vhd
	modules/wrsw_nic/nic_wbgen2_pkg.vhd
	modules/wrsw_nic/nic_wishbone_slave.vhd
	modules/wrsw_nic/wrsw_nic.vhd
	modules/wrsw_nic/xwrsw_nic.vhd
	top/bare_top/scb_top_bare.vhd
	top/bare_top/wrsw_components_pkg.vhd
	top/bare_top/wrsw_top_pkg.vhd
	top/scb_18ports/scb_top_synthesis.vhd
parents cc361ad0 f1c9d65d
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1800 additions and 490 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment