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

c42a7563

Commit c42a7563 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' into feature/146/upsample

parents d8af5453 82e627db

No related branches found

No related tags found

1 merge request!88Implements #146 upsampling option

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

components/net/cpp/include/ftl/net/universe.hpp 1 addition, 1 deletion

components/net/cpp/include/ftl/net/universe.hpp
components/net/cpp/src/universe.cpp 2 additions, 2 deletions

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

components/rgbd-sources/include/ftl/rgbd/streamer.hpp
components/rgbd-sources/src/net.cpp 1 addition, 2 deletions

components/rgbd-sources/src/net.cpp
components/rgbd-sources/src/source.cpp 7 additions, 4 deletions

components/rgbd-sources/src/source.cpp
components/rgbd-sources/src/streamer.cpp 26 additions, 31 deletions

components/rgbd-sources/src/streamer.cpp

with 38 additions and 41 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