Merge remote-tracking branch 'origin/develop' into feature-230-tm3_scheduler
Conflicts: openair1/PHY/LTE_TRANSPORT/dci_tools.c openair1/SCHED/phy_procedures_lte_ue.c
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
100755 → 100644
File mode changed from 100755 to 100644
Please register or sign in to comment