-
Cedric Roux authored
Conflicts: cmake_targets/build_oai openair1/PHY/LTE_TRANSPORT/dci.c openair1/PHY/LTE_TRANSPORT/proto.h openair1/SCHED/phy_procedures_lte_eNb.c openair1/SCHED/phy_procedures_lte_ue.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c openair2/LAYER2/MAC/eNB_scheduler_primitives.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c targets/SIMU/USER/oaisim.c targets/SIMU/USER/oaisim_functions.c
6a8b8b82