Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lerwys
lerwys committed May 31, 2019
2 parents 911519f + b95bd96 commit 28e88fd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hdl/ip_cores/infra-cores
Submodule infra-cores updated 9 files
+4 −0 modules/wishbone/wb_acq_core/acq_core_pkg.vhd
+49 −1 modules/wishbone/wb_acq_core/acq_ddr3_axis_read.vhd
+49 −1 modules/wishbone/wb_acq_core/acq_ddr3_ui_read.vhd
+23 −19 modules/wishbone/wb_acq_core/acq_fc_fifo.vhd
+1 −1 modules/wishbone/wb_acq_core/acq_multishot_dpram.vhd
+10 −28 modules/wishbone/wb_acq_core/acq_trigger.vhd
+6 −11 modules/wishbone/wb_acq_core/fc_source.vhd
+24 −22 modules/wishbone/wb_acq_core/wb_acq_core.vhd
+2 −2 testbench/wishbone/wb_acq_core_test/verilog/artix7/full_tb_mux/wb_acq_core_tb.v

0 comments on commit 28e88fd

Please sign in to comment.