Skip to content
Snippets Groups Projects
Commit 4d71261c authored by knopp's avatar knopp
Browse files

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/INIT/lte_init_ru.c
	openair1/PHY/defs.h
	openair2/ENB_APP/enb_paramdef.h
	targets/RT/USER/lte-ru.c
parents 79c8d0e0 e56ae69b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 778 additions and 142 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