Merge branch 'devel'

d520e6f1 · Lucas Russo · 2fe9e3a8 · d56c1195 · c544b987 · d520e6f1
Commit d520e6f1 authored Jul 12, 2017 by Lucas Russo
Expand all Show whitespace changes
Inline Side-by-side

Showing with 33 additions and 33 deletions

dsp-cores hdl/ip_cores/dsp-cores +1 -1

dbe_bpm_gen.vhd hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd +32 -32

No files found.
--- a/dsp-cores @ c544b987
+++ b/dsp-cores @ c544b987
-Subproject commit d8ddce38be9fa14fe486f8273985782ecd9b7427
+Subproject commit c544b987e77dde307103cb4114ce26f2d7dbc413
--- a/hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd
+++ b/hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd