Wang Tsu-Han 21fa809ce0 Merge branch 'ru_parallel' into ru-parallel-beamforming ...

Conflicts:
	executables/nr-ru.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/SCHED_NR/nr_ru_procedures.c

2019-08-14 16:51:59 +02:00

..

LIB

Merge branch 'ru_parallel' into ru-parallel-beamforming

2019-08-14 16:51:59 +02:00