• Xue Song's avatar
    Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo · 834d6f10
    Xue Song authored
    Conflicts:
    	cmake_targets/CMakeLists.txt
    	executables/nr-softmodem.c
    	executables/nr-uesoftmodem.c
    	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
    	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
    	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
    	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
    834d6f10
lte-softmodem.c 24.8 KB