Raymond Knopp 47e0d056be Merge branch 'NR_RRCConfiguration' into NR_RRC_PRACH_procedures ...

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_nr_common.h
	openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

2020-03-09 21:14:32 +01:00

..

config

Merge branch 'fhg-ta' into fhg-ra

2020-02-03 10:45:29 +01:00

utils

Merge branch 'NR_RRCConfiguration' into NR_RRC_PRACH_procedures

2020-03-09 21:14:32 +01:00

ngran_types.h

COMMON types updated: VCD,FAPI

2019-09-14 12:55:32 +02:00

ran_context.h

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

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