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

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED/phy_procedures_lte_eNb.c

2016-05-20 03:49:36 -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

some more warning removals

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

LAYER2

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

2016-05-20 03:49:36 -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

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

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

RRC

added missing structure element in eNB_RRC_UE_t : ue_release_timer_thres

2016-05-16 05:47:02 -07: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 from bugfix-48-L1L2Signalling to develop

2016-05-02 15:12:11 +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