Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

9c83bd5a

Commit 9c83bd5a authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/115/snapshotmulti' into 'master'

Resolves #115 in groupview app

Closes #115

See merge request nicolas.pope/ftl!77

parents 52520e65 5abd1118

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/groupview/src/main.cpp 78 additions, 3 deletions

applications/groupview/src/main.cpp
applications/reconstruct/src/main.cpp 5 additions, 4 deletions

applications/reconstruct/src/main.cpp
components/rgbd-sources/src/group.cpp 1 addition, 0 deletions

components/rgbd-sources/src/group.cpp
components/rgbd-sources/src/net.cpp 74 additions, 57 deletions

components/rgbd-sources/src/net.cpp
components/rgbd-sources/src/net.hpp 2 additions, 2 deletions

components/rgbd-sources/src/net.hpp
components/rgbd-sources/src/snapshot.cpp 2 additions, 1 deletion

components/rgbd-sources/src/snapshot.cpp
components/rgbd-sources/src/snapshot_source.cpp 7 additions, 1 deletion

components/rgbd-sources/src/snapshot_source.cpp
components/rgbd-sources/src/source.cpp 10 additions, 1 deletion

components/rgbd-sources/src/source.cpp
config/config_nick.jsonc 209 additions, 12 deletions

config/config_nick.jsonc

with 388 additions and 81 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