Skip to content
Snippets Groups Projects
Commit 1e0b154c authored by Marco Riggirello's avatar Marco Riggirello
Browse files

Merge branch 'heterogeneous-dtc' into 'configurable-thresholds'

# Conflicts:
#   common/addr_table/link_aggregator.xml
#   common/firmware/hdl/LinkAggregatorIPBus.vhd
parents 0f970384 93a07bc4
No related tags found
1 merge request!405 bits thresholds registers
Pipeline #6212878 passed