Skip to content
Snippets Groups Projects
Commit 351ca5e7 authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19 

Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/RT/USER/lte-ue.c
parents 7da4367c 727b368d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 229 additions and 39 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