rmagueta 722505f22d Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs ...

# Conflicts:
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_UE/config_ue.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

2021-09-08 17:05:01 +01:00

..

MAC

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716

2021-08-04 19:57:45 +02:00

NR_MAC_COMMON

commit before merge with develop

2021-09-04 22:42:32 +02:00

NR_MAC_gNB

Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs

2021-09-08 17:05:01 +01:00

NR_MAC_UE

Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs

2021-09-08 17:05:01 +01:00

nr_pdcp

Temporary fix for SRB2 integrity algorithm

2021-09-08 12:26:03 +01:00

nr_rlc

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-06 10:34:14 +02:00

PDCP_v10.1.0

code-cleanup-20210716

2021-07-16 17:16:15 +02:00

PROTO_AGENT

Fix build

2021-06-05 02:22:38 +01:00

RLC

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

2021-04-26 10:51:18 +02:00

rlc_v2

Code format improvements in differences for develop

2021-05-12 19:29:10 +01:00

openair2_proc.c

code-cleanup-20210716

2021-07-16 17:16:15 +02:00