rmagueta 948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS ...

# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

2021-05-03 19:50:30 +01:00

..

CENTOS-LTE-EPC-INTEGRATION/CONF

nr: improve x2/rrc for ENDC

2020-09-22 11:57:31 +02:00

GENERIC-LTE-EPC/CONF

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

2021-05-03 19:50:30 +01:00

GENERIC-NR-5GC/CONF

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

2021-04-27 15:46:18 +01:00