openair2/LAYER2/MAC/eNB_scheduler_ulsch.c · 02e8dac00b06790a348d86364ddc80cf2e49e18d · OpenXG / OpenXG-RAN · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36 · 2cb87ddd
Cedric Roux authored Sep 07, 2018
```
Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
```
2cb87ddd

eNB_scheduler_ulsch.c 63.8 KB