Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts
# Conflicts: # openair1/PHY/INIT/nr_init_ru.c # openair1/PHY/NR_TRANSPORT/nr_ulsch.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/RRC/NR/L2_nr_interface.c # openair2/RRC/NR/rrc_gNB_NGAP.c # targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
Showing
This diff is collapsed.
Please register or sign in to comment