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
..
2018-04-05 13:22:12 +03:00
2020-03-11 10:37:48 +01:00
2020-02-12 19:05:44 +01:00
2019-09-14 13:59:53 +02:00
2019-02-25 16:50:03 +01:00
2020-04-28 15:39:50 +02:00
2020-02-12 19:05:44 +01:00
2014-09-12 06:19:51 +00:00
2019-11-28 06:35:31 +01:00
2019-01-09 20:49:15 +01:00