Skip to content
Snippets Groups Projects
Commit 0b58a7e8 authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files

Merge branch 'develop' into hotfix-81-oaisim

Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/initial_sync.c
	openair1/SCHED/phy_procedures_lte_ue.c
parents 38159dfc 3fa926e4
No related branches found
No related tags found
Loading
Showing
with 623 additions and 929 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