Konstantinos Alexandris 938e0242e2 Merge remote-tracking branch 'origin/develop' into x2 ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h

2018-09-07 15:30:49 +02:00

..

COMMON

Pass multi socket descriptor in SCTP + add SCTP multi init req/resp mechanism

2018-09-07 15:15:41 +02:00

DOCS

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

ENB_APP

Merge remote-tracking branch 'origin/develop' into x2

2018-09-07 15:30:49 +02:00

LAYER2

Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35

2018-08-31 12:55:28 +02:00

NETWORK_DRIVER

Merge remote-tracking branch 'origin/336-fhg-embms-changes' into develop_integration_2018_w35

2018-08-31 11:42:26 +02:00

PHY_INTERFACE

remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX

2018-07-30 20:07:22 +02:00

RRC

Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35

2018-08-31 12:55:28 +02:00

UTIL

fix 344

2018-08-23 13:06:17 +02:00

X2AP

Merge remote-tracking branch 'origin/develop' into x2

2018-09-07 15:30:49 +02:00