Raymond Knopp d32cdd1f33 Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes ...

Conflicts:
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c

2018-01-16 03:55:37 -08:00

..

L2_INTERFACE

upgrade license to version 1.1

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

LITE

Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes

2018-01-16 03:55:37 -08:00

NAS

upgrade license to version 1.1

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