Florian Kaltenberger 3e81e8c86b Merge remote-tracking branch 'origin/develop' into feature-59-tm4 ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/MODULATION/slot_fep.c
	openair1/PHY/TOOLS/lte_phy_scope.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c

2016-10-06 21:56:06 +02: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 feature-59-tm4

2016-10-06 21:56:06 +02:00