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

..

COMMON

Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent

2016-04-04 10:49:02 +01:00

DOCS

astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200

2015-04-09 09:29:12 +00:00

ENB_APP

Added support for multiple eNBs

2016-04-25 17:12:11 +01:00

LAYER2

Merge remote-tracking branch 'oai/develop' into oai-integration

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

NAS

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

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

NETWORK_DRIVER

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

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

PHY_INTERFACE

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

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

RRC

Merge remote-tracking branch 'oai/develop' into oai-integration

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

RRM_4_RRC_LITE

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

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

UTIL

Merge remote-tracking branch 'oai/develop' into oai-integration

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

X2AP

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

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

Makefile

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

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