Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 ...

Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c

2021-02-10 15:56:50 +09:00

..

main-fs6.c

merge develop, improve doc

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

main-ocp.c

fix build error of enb and ittisim

2021-02-10 01:07:02 +00:00

nr-gnb.c

Merge remote-tracking branch 'origin/pusch-mthread-scaling-fix' into rh_wk50_debug

2020-12-09 09:49:48 +01:00

nr-ru.c

Merge remote-tracking branch 'origin/benetel_phase_rotation' into integration_2020_wk46_2

2020-11-13 13:21:42 +01:00

nr-softmodem-common.h

Cleanup UE mac_enabled conditions

2020-12-27 19:28:13 +01:00

nr-softmodem.c

Merge branch 'master' into develop_SA_rfsim_for_F1

2021-02-04 18:16:37 +09:00

nr-softmodem.h

nr scope as a dynamically loaded shared lib

2020-07-17 15:59:38 +02:00

nr-ue.c

move definitions from defs_nr_UE.h back to nr-ue.c to fix compilation of LTE UE

2021-01-25 13:59:21 +01:00

nr-uesoftmodem.c

Merge branch 'master' into develop_SA_rfsim_for_F1

2021-02-10 15:56:50 +09:00

nr-uesoftmodem.h

make sure MAC is enabled in nr-uesoftmodem

2021-01-22 12:06:41 +01:00

ocp-gnb.c

fix after code review

2021-01-21 13:47:18 +01:00

softmodem-common.c

merge develop

2020-04-13 18:04:18 +02:00

softmodem-common.h

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

2020-12-18 13:43:48 +00:00

split_headers.h

Merge remote-tracking branch 'origin/fembms-enb-ue' into develop_integration_2020_w34

2020-08-21 16:13:08 +02:00

stats.h

CI: optmimizations on VM-based framework

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

thread-common.h

Updated the config files

2020-11-25 11:12:32 +01: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