Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07
Conflicts: openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c openair1/PHY/LTE_TRANSPORT/power_control.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c targets/SIMU/USER/oaisim_functions.c
Showing
This diff is collapsed.
openair1/PHY/INIT/lte_init.c
100644 → 100755
This diff is collapsed.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
100644 → 100755
This source diff could not be displayed because it is too large. You can view the blob instead.
openair1/PHY/LTE_TRANSPORT/defs.h
100644 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.