Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling ...

Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c

2016-03-31 14:36:12 -07:00

..

SAP

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

DedicatedEpsBearerContextActivation.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

DefaultEpsBearerContextActivation.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

EpsBearerContextDeactivation.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_ebr_context.c

Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling

2016-03-31 14:36:12 -07:00

esm_ebr_context.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_ebr.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_ebr.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_ip.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_main.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_main.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_proc.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_pt.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esm_pt.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

esmData.h

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

EsmStatusHdl.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

PdnConnectivity.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

PdnDisconnect.c

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00