Skip to content
Snippets Groups Projects
Commit 02c9e831 authored by knopp's avatar knopp
Browse files

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

Conflicts:
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-ru.c
parents 5bc28899 f8037ab6
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2246 additions and 184 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