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

6b350e85

Commit 6b350e85 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl

parents f3942793 27912b25

No related branches found

No related tags found

No related merge requests found

Pipeline #12434 failed 5 years ago

Stage: all

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/groupview/src/main.cpp 5 additions, 2 deletions

applications/groupview/src/main.cpp
applications/reconstruct/src/voxel_scene.cpp 1 addition, 0 deletions

applications/reconstruct/src/voxel_scene.cpp
components/common/cpp/include/ftl/threads.hpp 4 additions, 3 deletions

components/common/cpp/include/ftl/threads.hpp
components/control/cpp/src/master.cpp 2 additions, 2 deletions

components/control/cpp/src/master.cpp
components/net/cpp/include/ftl/net/peer.hpp 7 additions, 1 deletion

components/net/cpp/include/ftl/net/peer.hpp
components/net/cpp/src/peer.cpp 77 additions, 57 deletions

components/net/cpp/src/peer.cpp
components/rgbd-sources/include/ftl/rgbd/group.hpp 1 addition, 1 deletion

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

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

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

components/rgbd-sources/src/streamer.cpp

with 104 additions and 70 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