Merge branch 'wishbonized' of ohwr.org:hdl-core-lib/wr-cores into wishbonized

Conflicts: modules/wr_endpoint/ep_rx_bypass_queue.vhd modules/wr_mini_nic/wr_mini_nic.vhd testbench/wr_endpoint/full_tb/main.sv

Merge branch 'wishbonized' of ohwr.org:hdl-core-lib/wr-cores into wishbonized
Conflicts: modules/wr_endpoint/ep_rx_bypass_queue.vhd modules/wr_mini_nic/wr_mini_nic.vhd testbench/wr_endpoint/full_tb/main.sv
1c25e2db · Tomasz Wlostowski · 7c852bf7 · 2dc8043c · 1c25e2db
Commit 1c25e2db authored Oct 25, 2011 by Tomasz Wlostowski
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 594 additions and 0 deletions

wbp_mux.vhd modules/wrc_core/wbp_mux.vhd +594 -0

No files found.
--- a/modules/wrc_core/wbp_mux.vhd
+++ b/modules/wrc_core/wbp_mux.vhd