Raymond Knopp b1e633bb94 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony ...

Conflicts:
	openair1/PHY/defs.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c

2016-07-23 01:23:06 -07: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

fixes for reading cc_synch

2016-07-22 15:40:47 +02:00

LAYER2

Merge remote-tracking branch 'origin' into enhancement-10-harmony

2016-06-21 23:36:23 -07: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

changed threading (acqusition is slot based). removal of eNB_thread. timing all based on received timestamp.

2016-05-26 15:14:57 -07:00

RRC

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2016-07-14 12:52:21 +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

commit before merge

2016-07-23 01:17:59 -07: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