Raymond Knopp 4d71261cb9 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

2018-03-11 08:45:09 +01:00

..

EXAMPLES

update the perf_oai script

2015-06-04 14:45:55 +00:00

PROC

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

USER

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

2018-03-11 08:45:09 +01:00