Skip to content
Snippets Groups Projects
Commit 29eca468 authored by luis_pereira87's avatar luis_pereira87
Browse files

Merge remote-tracking branch 'origin/develop' into bler_txoptim 

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
parents 12e8818b 8b21ecc3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 891 additions and 81 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