Skip to content
Snippets Groups Projects
Commit c1fff427 authored by knopp's avatar knopp
Browse files

Merge branch 'RU-RAU-split' of... 

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
parents 01868ade eaf4c79f
No related branches found
No related tags found
4 merge requests!650Release v1.1.0 Candidate,!588Develop nr merge,!504Develop integration 2019 w06,!451Enhancement LTE-M
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment