Florian Kaltenberger 2b213a0ccc Merge branch 'develop' into feature-59-tm4 ...

Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c

2016-04-19 15:50:05 +02:00

..

COMMON

avoid duplicate #define

2016-03-25 22:26:40 +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

some more warning removals

2016-03-28 22:45:20 +02:00

LAYER2

Merge branch 'develop' into feature-59-tm4

2016-04-19 15:50:05 +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

remove more warnings

2016-03-27 13:36:37 +02:00

RRC

Merge branch 'develop' into feature-59-tm4

2016-04-19 15:50:05 +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-04-19 15:50:05 +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