wu.jing c994c2ad8f Merge branch 'develop_SA_SIM' into develop_SA_L3 ...

Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/COMMON/gtpv1_u_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/NGAP/ngap_gNB_nas_procedures.c

2020-11-24 09:15:52 +00:00

..

config

CPPCHECK: fixes

2020-06-19 11:41:03 +02:00

utils

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

ngran_types.h

COMMON types updated: VCD,FAPI

2019-09-14 12:55:32 +02:00

ran_context.h

Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ

2020-11-17 19:03:55 +09:00