Skip to content
Snippets Groups Projects
Commit f92bd915 authored by Cédric Roux's avatar Cédric Roux
Browse files

Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07 

 Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
parents bfa8a28c 6397e66c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 379 additions and 314 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