Florian Kaltenberger ee6239a838 fixing merge

2018-10-11 07:45:54 -07:00

..

COMMON

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

2018-08-25 18:20:44 +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 develop-nr

2018-08-25 18:20:44 +02:00

GNB_APP

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

LAYER2

fixing merge

2018-10-11 07:45:54 -07:00

NETWORK_DRIVER

small modifications for CentOS build

2018-08-04 08:39:25 +02:00

NR_PHY_INTERFACE

Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"

2018-08-09 06:08:33 -07:00

NR_UE_PHY_INTERFACE

Merge branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +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 branch 'nr_pdcch' into develop-nr

2018-10-11 15:37:50 +02:00

UTIL

Merge branch 'develop-nr-merge' into develop-nr

2018-08-30 07:08:26 -07:00

X2AP

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

2018-08-25 18:20:44 +02:00