• rmagueta's avatar
    Merge remote-tracking branch 'origin/develop' into develop-CSI · bbe806a8
    rmagueta authored
    # Conflicts:
    #	openair1/SIMULATION/NR_PHY/dlsim.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    #	openair2/RRC/NR/MESSAGES/asn1_msg.c
    #	openair2/RRC/NR/MESSAGES/asn1_msg.h
    #	openair2/RRC/NR/nr_rrc_config.c
    #	openair2/RRC/NR/nr_rrc_config.h
    #	openair2/RRC/NR/rrc_gNB.c
    #	openair2/RRC/NR/rrc_gNB_nsa.c
    bbe806a8
main-ocp.c 50.5 KB