Cedric Roux 2cb87ddd02 Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36 ...

Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

2018-09-07 16:13:40 +02:00

..

COMMON

Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36

2018-09-07 16:13:40 +02:00

DOCS

upgrade license to version 1.1

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

ENB_APP

Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36

2018-09-07 16:13:40 +02:00

LAYER2

Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36

2018-09-07 16:13:40 +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/feature-slice+restart-w35' into develop_integration_2018_w36

2018-09-07 16:13:40 +02:00

UTIL

merge with latest develop

2018-09-06 09:43:26 +02:00

X2AP

integration fix: fix compilation error

2018-08-31 18:11:45 +02:00