Thomas Schlichter 5903467849 Merge remote-tracking branch 'develop' into nr_fdd_if_fix ...

Conflicts:
	ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_gNB/config.c

2020-11-03 14:27:16 +01:00

..

CENTOS-LTE-EPC-INTEGRATION/CONF

nr: improve x2/rrc for ENDC

2020-09-22 11:57:31 +02:00

GENERIC-LTE-EPC/CONF

Merge remote-tracking branch 'develop' into nr_fdd_if_fix

2020-11-03 14:27:16 +01:00