Raymond Knopp df05672a4c Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS ...

Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_nsa.c

2021-03-30 04:48:51 +02:00

..

COMMON

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

2021-03-30 04:48:51 +02:00

DOCS

Fixing errored/missing circular dependency protection

2020-05-15 15:39:11 +02:00

ENB_APP

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

2021-03-27 15:31:22 +01:00

F1AP

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

2021-03-30 04:48:51 +02:00

GNB_APP

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

2021-03-30 04:48:51 +02:00

LAYER2

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

2021-03-30 04:48:51 +02:00

M2AP

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

MCE_APP

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

NETWORK_DRIVER

trivial merge with develop"

2021-02-11 13:27:00 +01:00

NR_PHY_INTERFACE

Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA

2021-03-19 15:07:08 +00:00

NR_UE_PHY_INTERFACE

changes in UE to start configuration from Initial/MIB/SIB1/RRCSetup

2021-03-30 03:44:58 +02:00

PHY_INTERFACE

Merge conflicts resolved

2021-02-08 18:05:29 +05:30

RRC

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

2021-03-30 04:48:51 +02:00

SDAP/nr_sdap

Create asn1 file

2020-09-03 17:17:47 +09:00

SIMULATION/NR_RRC

Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU

2021-03-15 12:44:16 +00:00

UTIL

NSA: some work on security (for PDCP)

2021-02-12 16:01:37 +01:00

X2AP

Merge remote-tracking branch 'develop' into NR_10MHz

2021-03-16 16:13:17 +01:00