Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

otb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

91560ce8

Commit 91560ce8 authored 5 years ago by Antoine Regimbeau

Downloads
- Plain Diff

Merge branch 'develop' into hyperspect_ncls

parents a2b1525a 80bfa6ee

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 15 additions, 7 deletions

.gitlab-ci.yml
CI/Dockerfile.nat 0 additions, 78 deletions

CI/Dockerfile.nat
CI/Dockerfile.shark3.1.4 0 additions, 126 deletions

CI/Dockerfile.shark3.1.4
CI/deploy.sh 4 additions, 14 deletions

CI/deploy.sh
Modules/Remote/diapotb.remote.cmake 1 addition, 1 deletion

Modules/Remote/diapotb.remote.cmake
Modules/Wrappers/QGIS/src/otbQgisDescriptor.cxx 53 additions, 53 deletions

Modules/Wrappers/QGIS/src/otbQgisDescriptor.cxx

with 73 additions and 279 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