Wu.Jing 37d52bdf60 Merge branch 'develop_SA_SIM' into develop_SA_L3 ...

Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c

2020-12-18 17:38:07 +09: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

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

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

NAS

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

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

NR

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-12-18 17:38:07 +09:00

NR_UE

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-12-18 17:38:07 +09:00