Florian Kaltenberger 6bebff3681 Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch ...

Conflicts:
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/fapi_nr_l1.h

2018-11-16 11:24:58 +01:00

..

COMMON

merging develop with develop-nr

2018-10-25 03:15:09 -07:00

DOCS

upgrade license to version 1.1

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

ENB_APP

merging develop with develop-nr

2018-10-25 03:15:09 -07:00

GNB_APP

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

2018-11-16 11:24:58 +01:00

LAYER2

Freq shift correction/Various cleanups

2018-11-09 18:56:19 +01:00

NETWORK_DRIVER

fix nasmesh kernel 4.15

2018-09-07 15:44:57 +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_pbchsim' into develop-nr-merge2

2018-10-26 11:59:35 -07:00

UTIL

merging develop with develop-nr

2018-10-25 03:15:09 -07:00

X2AP

merging develop with develop-nr

2018-10-25 03:15:09 -07:00