Merge branch 'master' into develop (02d69280) · Commits · cellframe / cellframe-sdk · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cellframe-sdk
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

02d69280

Commit 02d69280 authored 4 years ago by Dmitriy A. Gerasimov

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 650e9b26 dc8c90db

2 merge requests!251Master,!250Master

Pipeline #5490 passed with stage

in 41 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
modules/chain/dap_chain_cell.c 8 additions, 2 deletions

modules/chain/dap_chain_cell.c
modules/chain/include/dap_chain.h 2 additions, 0 deletions

modules/chain/include/dap_chain.h
modules/channel/chain/dap_stream_ch_chain.c 34 additions, 9 deletions

modules/channel/chain/dap_stream_ch_chain.c
modules/consensus/dag-poa/dap_chain_cs_dag_poa.c 9 additions, 0 deletions

modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
modules/type/dag/dap_chain_cs_dag.c 68 additions, 9 deletions

modules/type/dag/dap_chain_cs_dag.c
modules/type/dag/include/dap_chain_cs_dag.h 1 addition, 1 deletion

modules/type/dag/include/dap_chain_cs_dag.h
modules/type/dag/include/dap_chain_cs_dag_event.h 1 addition, 1 deletion

modules/type/dag/include/dap_chain_cs_dag_event.h

with 124 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment