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

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1 

 Conflicts:
	openair2/LAYER2/NR_MAC_UE/mac_defs.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
parents 205d98bd b9b2f289
No related branches found
No related tags found
8 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1093Issue in generating NR PRACH for High Speed case,!1074PBCH test case support for non-zero bchpyload,!1020Develop,!1016Integration 2021 wk02,!1011Integration 2021 wk02,!988SIB1
Hide whitespace changes
Inline Side-by-side
Showing
with 334 additions and 377 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