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

 Conflicts:

	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

2020-11-27 17:37:15 +00:00

..

fapi_nr_ue_constants.h

Merge develop-sib1 into this branch

2020-11-19 02:22:47 +00:00

fapi_nr_ue_interface.h

Merge remote-tracking branch 'origin/NR_UE_stability_fixes' into integration_2020_wk48_2

2020-11-25 12:25:45 +01:00

nfapi_interface.h

Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr

2020-01-10 15:35:54 +01:00

nfapi_nr_interface_scf.h

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

2020-10-22 09:26:51 +02:00

nfapi_nr_interface.h

merge develop

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