Thomas Schlichter 225a500b3e Merge branch 'develop' into NR_RRC_PRACH_procedures ...

Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_REFSIG/dmrs_nr.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

2020-06-03 19:50:54 +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-06-03 19:50:54 +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