Merge branch 'master' of gitlab.demlabs.net:cellframe/cellframe-node into feature-13362 (d50be406) · Commits · cellframe / celllframe-node · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

celllframe-node
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

d50be406

Commit d50be406 authored 4 months ago by daniil.frolov

Downloads
- Plain Diff

Merge branch 'master' of gitlab.demlabs.net:cellframe/cellframe-node into feature-13362

parents 6dcb36c5 a018d95a

No related branches found

No related tags found

3 merge requests!1779Develop port 02 12,!1743Hotfix update subs,!1709feature-13362

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 13 additions, 2 deletions

.gitlab-ci.yml
CMakeLists.txt 13 additions, 0 deletions

CMakeLists.txt
cellframe-sdk 1 addition, 1 deletion

cellframe-sdk
conftool/commands/ConfigCommand.cpp 2 additions, 2 deletions

conftool/commands/ConfigCommand.cpp
conftool/service/service_win.cpp 1 addition, 1 deletion

conftool/service/service_win.cpp
dap-sdk 1 addition, 1 deletion

dap-sdk
dist/share/configs/cellframe-node.cfg 44 additions, 14 deletions

dist/share/configs/cellframe-node.cfg
python-cellframe 1 addition, 1 deletion

python-cellframe
sources/cellframe-node.c 56 additions, 35 deletions

sources/cellframe-node.c
sources/cellframe-node.h 1 addition, 0 deletions

sources/cellframe-node.h

with 133 additions and 57 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