lukashov 54bce4155c Merge branch 'develop' into feature-59-tm4 ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

2016-09-15 14:33:49 +02:00

..

COMMON

Merge remote-tracking branch 'origin/develop' into enhancement-16-tm_rrc_reconfig

2016-08-30 15:53:46 +02: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

bugfix: print a warning when a configuration parameter is not found

2016-09-05 11:41:48 +02:00

LAYER2

Merge branch 'develop' into feature-59-tm4

2016-09-15 14:33:49 +02: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 branch 'develop' into feature-59-tm4

2016-09-15 14:33:49 +02: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-59-tm4

2016-09-15 14:33:49 +02: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