rmagueta 948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS ...

# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

2021-05-03 19:50:30 +01:00

..

main-fs6.c

merge develop, improve doc

2020-10-21 14:38:17 +02:00

main-ocp.c

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

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

nr-gnb.c

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

2021-05-03 19:50:30 +01:00

nr-ru.c

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

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

nr-softmodem-common.h

Update phytest cmdline parameter description after review

2021-04-16 16:46:17 +02:00

nr-softmodem.c

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

2021-04-30 18:00:27 +01:00

nr-softmodem.h

Add cmd line options for DL&UL phytest scheduling

2021-04-16 16:45:15 +02:00

nr-ue.c

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

2021-05-03 19:50:30 +01:00

nr-uesoftmodem.c

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

2021-05-03 19:50:30 +01:00

nr-uesoftmodem.h

Fix warning after merge

2021-04-30 18:25:19 +01:00

ocp-gnb.c

Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15

2021-04-14 14:56:04 +02:00

softmodem-common.c

Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15

2021-04-14 14:56:04 +02:00

softmodem-common.h

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

2021-05-03 19:50:30 +01:00

split_headers.h

benetel: driver for Benetel's 4G and 5G RRUs

2020-10-12 18:56:41 +02:00

stats.h

CI: optmimizations on VM-based framework

2020-09-15 12:18:26 +02:00

thread-common.h

fix gcc reported issues

2021-04-03 23:37:58 +02:00

threads_t.h

CI: optmimizations on VM-based framework

2020-09-15 12:18:26 +02:00

transport_split.c

update license text

2020-04-29 11:31:00 +02:00

uecap.raw

modification in uecap.raw

2019-10-13 11:00:49 +02:00