Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2 ...

Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c

2021-02-24 23:00:04 +01:00

..

L2_INTERFACE

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

LITE

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

LTE

NSA: finalize nea2 security for gNB

2021-02-15 15:25:52 +01:00

NAS

CI: Add LTE RF Simulator test (normal and with MBMS)

2020-01-22 17:59:21 +01:00

NR

Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2

2021-02-24 23:00:04 +01:00

NR_UE

Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2

2021-02-24 23:00:04 +01:00