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

749ea646

Commit 749ea646 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/blendchan' into 'master'

Support channel blending

See merge request nicolas.pope/ftl!162

parents 208d97d0 7dae3c7d

No related branches found

No related tags found

Loading

Pipeline #16294 passed 5 years ago

Stage: all

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/screen.cpp 10 additions, 4 deletions

applications/gui/src/screen.cpp
components/operators/CMakeLists.txt 3 additions, 4 deletions

components/operators/CMakeLists.txt
components/operators/include/ftl/operators/disparity.hpp 6 additions, 0 deletions

components/operators/include/ftl/operators/disparity.hpp
components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp 3 additions, 0 deletions

...ents/rgbd-sources/src/sources/stereovideo/stereovideo.cpp

with 22 additions and 8 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