Raymond Knopp 5dc0d7ccea Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop ...

Conflicts:
	openair2/LAYER2/MAC/config.c

2018-01-16 03:46:24 -08:00

..

COMMON

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

DOCS

upgrade license to version 1.1

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

ENB_APP

Fix NFAPI integration

2018-01-15 15:24:50 +01:00

LAYER2

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

2018-01-16 03:46:24 -08:00

NAS

upgrade license to version 1.1

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

NETWORK_DRIVER

upgrade license to version 1.1

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

PHY_INTERFACE

Fix NFAPI integration

2018-01-15 15:24:50 +01:00

RRC

Fix NFAPI integration

2018-01-15 15:24:50 +01:00

UTIL

Fix NFAPI integration

2018-01-15 15:24:50 +01:00

X2AP

upgrade license to version 1.1

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

Makefile

upgrade license to version 1.1

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