Thomas Schlichter 79471f2f6d Merge branch 'develop' into NR_RRC_PRACH_procedures ...

Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_RU.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/X2AP/x2ap_eNB_handler.c

2020-04-30 18:54:37 +02:00

..

config

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

2020-03-15 18:13:11 +01:00

utils

Merge branch 'develop' into NR_RRC_PRACH_procedures

2020-04-30 18:54:37 +02: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