WANG Tsu-Han a6ecd29f90 Merge branch 'develop-nr' into uhd_set_thread_prio ...

Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	targets/RT/USER/nr-ru.c

2019-06-11 17:00:39 +02:00

..

LIB

Merge branch 'develop-nr' into uhd_set_thread_prio

2019-06-11 17:00:39 +02:00