Raymond Knopp b2cc1252c6 Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge ...

Conflicts:
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	targets/ARCH/COMMON/common_lib.c
	targets/COMMON/create_tasks.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

2018-03-12 12:10:48 +01:00

..

nfapi_pnf.c

import NFAPI work from David Price from Cisco (non-working commit, do not use it)

2018-01-15 11:32:30 +01:00

nfapi_pnf.h

more NB-IoT integration

2018-03-08 17:35:35 +01:00

nfapi_vnf.c

Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-03-12 12:10:48 +01:00

nfapi_vnf.h

import NFAPI work from David Price from Cisco (non-working commit, do not use it)

2018-01-15 11:32:30 +01:00

nfapi.c

import NFAPI work from David Price from Cisco (non-working commit, do not use it)

2018-01-15 11:32:30 +01:00

vendor_ext.h

import NFAPI work from David Price from Cisco (non-working commit, do not use it)

2018-01-15 11:32:30 +01:00