Roberto Louro Magueta 87e79e5eb8 Merge remote-tracking branch 'origin/develop' into develop-CSI ...

# 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/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf

2022-05-06 11:32:36 +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' into develop-CSI

2022-05-06 11:32:36 +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