Xenofon Foukas 0f5b01457b Merge remote-tracking branch 'oai/develop' into oai-integration ...

Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c

2016-05-17 13:18:09 +01: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 'oai/develop' into oai-integration

2016-05-17 13:18:09 +01:00