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

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/NR/rrc_gNB_nsa.c

2022-02-23 13:51:31 +00:00

..

CENTOS-LTE-EPC-INTEGRATION/CONF

Remove log verbosity level from all conf files: it is not used

2022-01-27 10:53:07 +01:00

GENERIC-LTE-EPC/CONF

Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08

2022-02-19 19:43:11 +01:00

GENERIC-NR-5GC/CONF

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

2022-02-23 13:51:31 +00:00