Skip to content
Snippets Groups Projects
Commit cf8f6fde authored by Roberto Louro Magueta's avatar Roberto Louro Magueta
Browse files

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

# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/L2_nr_interface.c
parents 3da125fa 8d1c9894
No related branches found
No related tags found
5 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1438integration_2022_wk06_a,!1415integration_2022_wk04_a,!1348develop-SRS
Hide whitespace changes
Inline Side-by-side
Showing
with 2662 additions and 67 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