rmagueta 3969079fcd Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements ...

# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

2022-04-08 19:49:40 +01:00

..

config.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00

gNB_scheduler_bch.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00

gNB_scheduler_dlsch.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00

gNB_scheduler_phytest.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00

gNB_scheduler_primitives.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00

gNB_scheduler_RA.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-08 19:49:40 +01:00

gNB_scheduler_srs.c

Clean up to nFAPI and error checking UL_TTI_REQ n_pdus

2022-03-08 07:47:44 -08:00

gNB_scheduler_uci.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-08 19:49:40 +01:00

gNB_scheduler_ulsch.c

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-08 19:49:40 +01:00

gNB_scheduler.c

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

2022-03-22 07:03:40 +01:00

mac_proto.h

Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b

2022-04-01 18:40:30 +02:00

main.c

Merge remote-tracking branch 'origin/develop' into aw2s-n41

2022-02-11 12:21:29 +01:00

nr_mac_gNB.h

Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements

2022-04-06 13:30:04 +01:00