Florian Kaltenberger b8c127050c Merge remote-tracking branch 'origin/develop-nr' into nr_pdcch_updates ...

Conflicts:
	openair1/PHY/MODULATION/slot_fep_nr.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	targets/RT/USER/nr-ue.c

2019-02-20 10:10:25 +01:00

..

LAUNCH_SCRIPTS

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5394 818b1a75-f10b-46b9-bf7c-635c3b92a50f

2014-06-13 16:39:57 +00:00

USER

Merge remote-tracking branch 'origin/develop-nr' into nr_pdcch_updates

2019-02-20 10:10:25 +01:00