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

# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.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/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf

2022-05-06 13:16:48 +01:00

..

ETH_TRANSPORT

Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d

2021-12-24 10:13:27 +01:00

LTE_PHY

rename frame_type

2022-04-19 18:37:14 +02:00

NR_PHY

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

2022-05-06 13:16:48 +01:00

NR_UE_PHY/unit_tests

fix difficult to read code

2022-03-24 14:38:17 +01:00

RF

Merging latest develop commits

2019-07-16 11:20:24 +02:00

TOOLS

Merge remote-tracking branch 'origin/tx-thread-stats-fix' into integration_2022_wk09_b

2022-03-05 13:34:15 +01:00

Makefile.inc

fix a lot of file mode

2019-01-07 16:22:28 +01:00