openair2/RRC/NR/rrc_gNB.c · b2d7e341caae51b71b926e8e6abf031c844d7ce4 · Michael Black / OpenXG UE

Merge branch 'develop_SA_RRC' into develop_SA_SIM · b2d7e341

wujing authored Nov 24, 2020

 Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c

b2d7e341

rrc_gNB.c 76.6 KB

Replace rrc_gNB.c