• luispereira87's avatar
    Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into... · ff9c1614
    luispereira87 authored
    Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts
    
    # Conflicts:
    #	openair2/F1AP/f1ap_du_rrc_message_transfer.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    ff9c1614
gNB_scheduler_dlsch.c 55.1 KB