rmagueta
a47861628b
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# 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_dlsch.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/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
..
2020-02-13 11:33:46 +01:00
2022-03-05 22:24:34 +01:00
2020-06-11 18:03:05 +02:00
2022-03-22 07:03:40 +01:00
2021-07-26 15:47:57 +02:00
2022-02-18 17:46:08 +00:00
2020-06-11 18:03:05 +02:00
2020-06-11 18:03:05 +02:00
2022-01-05 13:26:07 +01:00
2020-06-11 18:03:05 +02:00
2022-03-22 17:18:22 +00:00