Cedric Roux c836ef28f4 Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29 ...

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/UTIL/LOG/log.c
	targets/RT/USER/lte-uesoftmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c

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

..

L2_INTERFACE

Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes

2018-01-25 00:00:24 -08:00

LTE

Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29

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

NAS

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00