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
Showing
Please register or sign in to comment