Cedric Roux b1d0287327 Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29 ...

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c

2018-07-20 12:26:13 +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/issue321_tdd_config1' into develop_integration_2018_w29

2018-07-20 12:26:13 +02:00