Raymond Knopp 5ba8b83856 Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control ...

Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
	targets/ARCH/AW2SORI/oaiori.c

2022-02-13 12:24:45 +01:00

..

nr_common.c

Merge branch 'NR_pdcch_improvements' into aw2s-n41

2022-02-01 10:56:20 +01:00

nr_common.h

Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a

2022-02-08 18:06:53 +01:00