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

cd50e825

Commit cd50e825 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'pcl'

parents 221880f5 edefb0af

No related branches found

No related tags found

Loading

Pipeline #10584 failed 5 years ago

Stage: test

Changes 9
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
CMakeLists.txt 20 additions, 3 deletions

CMakeLists.txt
common/cpp/CMakeLists.txt 3 additions, 1 deletion

common/cpp/CMakeLists.txt
common/cpp/include/ftl/config.h.in 1 addition, 0 deletions

common/cpp/include/ftl/config.h.in
common/cpp/include/ftl/utility/opencv_to_pcl.hpp 22 additions, 0 deletions

common/cpp/include/ftl/utility/opencv_to_pcl.hpp
common/cpp/src/opencv_to_pcl.cpp 35 additions, 0 deletions

common/cpp/src/opencv_to_pcl.cpp
renderer/cpp/CMakeLists.txt 5 additions, 8 deletions

renderer/cpp/CMakeLists.txt
renderer/cpp/include/ftl/display.hpp 14 additions, 2 deletions

renderer/cpp/include/ftl/display.hpp
renderer/cpp/src/display.cpp 85 additions, 7 deletions

renderer/cpp/src/display.cpp

with 189 additions and 25 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