Skip to content
Snippets Groups Projects
Commit 849639f3 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
parents 71c047d1 ae12ccd5
No related branches found
No related tags found
No related merge requests found
Showing
with 3301 additions and 1492 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment