Merge branch 'develop' into ulSNRs
Conflicts: openair2/ENB_APP/enb_config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/mac.h
This diff is collapsed.
Conflicts: openair2/ENB_APP/enb_config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/mac.h