luis_pereira87 2fb267145e Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS ...

# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

2021-04-19 12:12:44 +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

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

2021-04-15 15:29:03 +01:00

NAS

add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND

2021-02-25 14:00:14 +09:00

NR

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

2021-04-19 12:12:44 +01:00

NR_UE

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

2021-04-19 12:12:44 +01:00