Eurecom 52af089e2d Merge remote-tracking branch 'origin/integration_2021_wk41' into CSI-SA ...

Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

2021-10-16 16:04:54 +02:00

..

nr_measurements_gNB.c

Merge remote-tracking branch 'origin/integration_2021_wk41' into CSI-SA

2021-10-16 16:04:54 +02:00

nr_ul_channel_estimation.c

Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs

2021-09-08 17:05:01 +01:00

nr_ul_estimation.h

Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing

2021-08-21 07:48:04 +02:00