Skip to content
Snippets Groups Projects
Commit 5a808cb1 authored by Raymond Knopp's avatar Raymond Knopp
Browse files

Merge branch 'develop' into enhancement-rfsim 

Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
parents ecfad451 d0926ec0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 895 additions and 130 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