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

..

nr_compute_tbs_common.c

bugfix

2022-05-26 13:47:17 +02:00

nr_mac_common.c

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

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

nr_mac_common.h

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

2022-05-27 11:13:02 +01:00

nr_mac_extern.h

Merge branch 'eurecom-develop' into episys/mel/sa_development_init

2021-11-03 08:54:06 -07:00

nr_mac.h

Fixes after merge

2022-05-19 13:38:22 +01:00