Thomas Schlichter
ce105df4e7
Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_transport.h
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/prachsim.c
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-05-20 19:26:16 +02:00
..
2020-03-11 10:37:48 +01:00
2018-07-13 02:02:08 -07:00
2020-05-20 19:26:16 +02:00
2019-10-08 18:48:39 +02:00
2020-03-14 12:45:02 +01:00
2018-07-13 02:02:08 -07:00
2018-07-13 02:02:08 -07:00
2020-05-20 19:26:16 +02:00