Skip to content
Snippets Groups Projects
Commit 93b9b735 authored by Xenofon Foukas's avatar Xenofon Foukas
Browse files

Merge remote-tracking branch 'oai/develop' into oai-integration 

Conflicts:
	cmake_targets/tools/build_helper
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
parents e29524a5 915282df
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4789 additions and 2938 deletions
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