• Cedric Roux's avatar
    Merge remote-tracking branch 'origin/develop' into feature-15-carrier_aggregation · 81f578f0
    Cedric Roux authored
    lte-softmodem compiles, not tested if things work...
    
    Conflicts:
    	cmake_targets/CMakeLists.txt
    	openair1/PHY/LTE_TRANSPORT/pucch.c
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair2/LAYER2/MAC/eNB_scheduler_RA.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/main.c
    	openair2/PHY_INTERFACE/defs.h
    	openair2/RRC/LITE/rrc_eNB.c
    	targets/RT/USER/lte-softmodem.c
    81f578f0
defs.h 16.3 KB