Skip to content
GitLab
Explore
Sign in
Register
oai
openairinterface5G
Repository
openairinterface5g
openair2
LAYER2
MAC
eNB_scheduler_ulsch.c
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/fix-ul-buffer-info-2018-w06' into develop_integration_2018_w06
· 724970e2
Cédric Roux
authored
Feb 07, 2018
Conflicts: openair2/LAYER2/MAC/eNB_scheduler_primitives.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
724970e2