• knopp's avatar
    Merge remote-tracking branch 'origin/develop' into RU-RAU-split · bc9c587b
    knopp authored
    Conflicts:
    	openair1/PHY/INIT/lte_init.c
    	openair1/PHY/LTE_ESTIMATION/defs.h
    	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
    	openair1/PHY/LTE_TRANSPORT/dci.c
    	openair1/PHY/LTE_TRANSPORT/dci_tools.c
    	openair1/PHY/LTE_TRANSPORT/defs.h
    	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
    	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
    	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
    	openair1/PHY/LTE_TRANSPORT/if5_tools.c
    	openair1/PHY/LTE_TRANSPORT/phich.c
    	openair1/PHY/LTE_TRANSPORT/proto.h
    	openair1/PHY/defs.h
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair1/SCHED/phy_procedures_lte_ue.c
    	openair1/SCHED/pusch_pc.c
    	openair2/ENB_APP/enb_config.c
    	openair2/LAYER2/MAC/defs.h
    	openair2/LAYER2/MAC/eNB_scheduler.c
    	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
    	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
    	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
    	openair2/LAYER2/MAC/pre_processor.c
    	openair2/LAYER2/MAC/ue_procedures.c
    	targets/RT/USER/lte-enb.c
    	targets/RT/USER/lte-softmodem.c
    	targets/RT/USER/lte-softmodem.h
    	targets/RT/USER/lte-ue.c
    	targets/SIMU/USER/init_lte.c
    	targets/SIMU/USER/oaisim_functions.c
    bc9c587b
Name
Last commit
Last update
..
README.txt Loading commit data...
defs.h Loading commit data...
extern.h Loading commit data...
init_top.c Loading commit data...
lte_init.c Loading commit data...
lte_param_init.c Loading commit data...
lte_parms.c Loading commit data...
vars.h Loading commit data...