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

..

EXAMPLES

update the perf_oai script

2015-06-04 14:45:55 +00:00

PROC

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

USER

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

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