Merge remote-tracking branch 'origin/develop-nb-iot' into develop-nb-iot-mac
Conflicts: openair1/PHY/impl_defs_lte_nb_iot.h
Showing
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