hardy ee398c7610 solved merge conflicts related to CI scripts

2021-03-16 11:55:23 +01:00

..

COMMON

Merge remote-tracking branch 'remotes/oai/develop' into HEAD

2021-03-08 14:51:11 +09:00

DOCS

Fixing errored/missing circular dependency protection

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

ENB_APP

Merge remote-tracking branch 'remotes/oai/develop' into HEAD

2021-03-08 14:51:11 +09:00

F1AP

itti dynamic queue creation, and 64 bits instance id

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

GNB_APP

Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08

2021-02-23 09:31:05 +01:00

LAYER2

solved merge conflicts related to CI scripts

2021-03-16 11:55:23 +01: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 MR978 (5G nFAPI) into develop

2021-02-12 16:26:22 +05:30

NR_UE_PHY_INTERFACE

Merge remote-tracking branch 'origin/develop-SA-RA' into integration_2021_wk10

2021-03-12 11:07:25 +01:00

PHY_INTERFACE

Merge conflicts resolved

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

RRC

solved merge conflicts related to CI scripts

2021-03-16 11:55:23 +01:00

SDAP/nr_sdap

Create asn1 file

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

SIMULATION/NR_RRC

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

2021-02-08 15:17:12 +00:00

UTIL

NSA: some work on security (for PDCP)

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

X2AP

Merge remote-tracking branch 'remotes/oai/develop' into HEAD

2021-03-08 14:51:11 +09:00