Roberto Louro Magueta 98f5478f7d Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements ...

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

2022-06-01 12:29:34 +01:00

..

MAC

commit before rebase

2022-03-24 14:05:30 +01:00

NR_MAC_COMMON

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-06-01 12:29:34 +01:00

NR_MAC_gNB

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-06-01 12:29:34 +01:00

NR_MAC_UE

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-06-01 12:29:34 +01:00

nr_pdcp

Remove clock_gettime() introduced in this branch

2022-05-04 10:48:25 +02:00

nr_rlc

Remove clock_gettime() introduced in this branch

2022-05-04 10:48:25 +02:00

PDCP_v10.1.0

Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08

2022-02-19 19:43:11 +01:00

RLC

Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08

2022-02-19 19:43:11 +01:00

rlc_v2

gtp-u old code delete

2022-01-26 11:27:02 +01:00

openair2_proc.c

code cleanup, no feature

2021-10-24 14:47:24 +02:00