openair2/RRC/NR/rrc_gNB.c · f3d51a58fbbbb46d0adac546d42dc975af4e224e · canghaiwuhen / OpenXG-RAN

Merge branch 'develop_SA_RRC' into develop_SA_SIM · f3d51a58

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

f3d51a58

rrc_gNB.c 76.6 KB

Replace rrc_gNB.c