Raymond Knopp f3a27d762a Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration ...

Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-gnb.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/COMMON/platform_constants.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	targets/COMMON/openairinterface5g_limits.h

2019-11-28 06:35:31 +01:00

..

config

merge of develop&develop-nr

2019-09-12 16:02:36 +02:00

utils

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

2019-11-28 06:35:31 +01:00

ngran_types.h

Check type of node using NODE_IS_CU/DU/MONOLITHIC macros

2019-03-26 13:15:02 +01:00

ran_context.h

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

2019-09-05 05:01:26 +02:00