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 branches found
No related tags found
Checking pipeline status
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2377 additions and 37 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