openair2/RRC/NR/nr_rrc_proto.h · 37d52bdf600a19a848543c9505ec03a15cc84af7 · promise / OpenXG-RAN

Merge branch 'develop_SA_SIM' into develop_SA_L3 · 37d52bdf

wujing authored Dec 18, 2020

 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

37d52bdf

nr_rrc_proto.h 5.44 KB

Replace nr_rrc_proto.h