Xenofon Foukas b6c9a4a713 Merge branch 'develop' into feature-68-enb-agent ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_config.h

2016-02-21 22:02:06 +00:00

..

COMMON

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

2016-01-31 18:15:36 +00: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

Merge branch 'develop' into feature-68-enb-agent

2016-02-21 22:02:06 +00:00

LAYER2

Added eNB configuration message

2016-02-21 21:35:44 +00: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 after bad rebase

2015-11-29 01:06:14 -08:00

RRC

msg_p should be msg_delete_tunnels_p

2016-01-22 11:54:16 +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 branch 'develop' into feature-68-enb-agent

2016-02-21 22:02:06 +00: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