rmagueta a7a3bf5d90 Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into develop-NR_SA_F1AP_5GRECORDS ...

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

2021-05-19 15:00:52 +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/fix-compile' into develop-NR_SA_F1AP_5GRECORDS

2021-05-19 12:09:27 +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_multiplexing_HARQ_CSI_PUCCH' into develop-NR_SA_F1AP_5GRECORDS

2021-05-19 15:00:52 +01:00

NR_UE

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

2021-05-19 12:09:27 +01:00