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

Merge branch 'develop' into enhancement-64-phy_test

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
parents 927975f1 bd235ec7
No related branches found
No related tags found
Loading
Showing
with 2494 additions and 1053 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