Skip to content
Snippets Groups Projects
Commit 37d52bdf authored by Wu.Jing's avatar Wu.Jing
Browse files

Merge branch 'develop_SA_SIM' into develop_SA_L3 

 Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
parents 19118c13 a53d6795
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1828 additions and 270 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