openair2/LAYER2/MAC/eNB_scheduler.c · e6f3c9b89915be51d67131626e30fe1f99d80914 · lizhongxiao / OpenXG-RAN · GitLab

Find file Blame History Permalink

Merge branch 'enhancement-10-harmony' into develop_integration_w03 · e6f3c9b8
Cedric Roux authored Jan 20, 2017
```
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
```
e6f3c9b8

eNB_scheduler.c 33.5 KB