• knopp's avatar
    Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit · 83b2f1c0
    knopp authored
    Conflicts:
    	openair1/PHY/INIT/lte_init.c
    	openair1/PHY/LTE_TRANSPORT/dci_tools.c
    	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
    	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
    	openair1/PHY/defs_eNB.h
    	openair1/SCHED_UE/phy_procedures_lte_ue.c
    	openair2/LAYER2/MAC/mac.h
    	targets/RT/USER/lte-enb.c
    	targets/RT/USER/lte-softmodem.h
    83b2f1c0
rt_wrapper.c 10.7 KB