Cedric Roux 351ca5e726 Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19 ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/RT/USER/lte-ue.c

2018-05-14 17:30:18 +02: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/basic-simulator' into develop_integration_2018_w19

2018-05-14 17:30:18 +02:00