• Xiwen JIANG's avatar
    Merge branch 'master' into feature-21-TM7 · 24645f26
    Xiwen JIANG authored
    Conflicts:
    	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
    	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
    	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
    	openair1/SCHED/phy_procedures_lte_ue.c
    	openair1/SIMULATION/LTE_PHY/dlsim.c
    	openair1/SIMULATION/LTE_PHY/mbmssim.c
    	targets/RT/USER/Makefile
    24645f26
Makefile 11.3 KB