rmagueta 0abcf3d9c4 Merge remote-tracking branch 'origin/develop' into develop-CSI ...

# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

2022-03-28 13:32:46 +01:00

..

nr_common.c

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

2022-03-28 13:32:46 +01:00

nr_common.h

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

2022-02-14 09:20:22 +01:00