• Cedric Roux's avatar
    Merge remote-tracking branch 'origin/develop' into feature-131-new-license · 7a724e7d
    Cedric Roux authored
    Conflicts:
    	openair1/PHY/INIT/lte_init.c
    	openair1/PHY/LTE_TRANSPORT/dci_tools.c
    	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair1/SCHED/phy_procedures_lte_ue.c
    	openair1/SIMULATION/LTE_PHY/dlsim.c
    	openair1/SIMULATION/RF/adc.c
    	openair2/LAYER2/MAC/lte_transport_init.c
    	targets/RT/USER/lte-softmodem.c
    	targets/RT/USER/sched_dlsch.c
    	targets/RT/USER/sched_rx_pdsch.c
    	targets/RT/USER/sched_ulsch.c
    	targets/SIMU/USER/oaisim.c
    7a724e7d
Name
Last commit
Last update
..
PHY Loading commit data...
SCHED Loading commit data...
SIMULATION Loading commit data...
COPYING Loading commit data...
Makefile Loading commit data...
README.TXT Loading commit data...