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

..

MAC

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

2021-04-27 11:58:31 +02:00

NR_MAC_COMMON

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

2021-05-17 01:36:39 +01:00

NR_MAC_gNB

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_MAC_UE

Fix segmentations fault after merge

2021-05-17 14:40:41 +01:00

nr_pdcp

Code format improvements in differences for develop

2021-05-12 19:29:10 +01:00

nr_rlc

Code format improvements in differences for develop

2021-05-12 19:29:10 +01:00

PDCP_v10.1.0

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

2021-04-27 11:58:31 +02:00

PROTO_AGENT

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

2021-05-17 01:36:39 +01:00

RLC

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

2021-04-26 10:51:18 +02:00

rlc_v2

Code format improvements in differences for develop

2021-05-12 19:29:10 +01:00

openair2_proc.c

Rename UE_list_t to UE_info_t, UE_list_t separate struct

2020-04-01 10:47:02 +02:00