Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

51e5a218

Commit 51e5a218 authored 7 years ago by Guillaume Pasero

Downloads
- Plain Diff

MRG: Merge bugfixes from branch 'release-6.4' into develop

Conflicts:
	Packaging/install_java_bindings.cmake

parents 2e436deb 38cafeb7

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx 1 addition, 1 deletion

...s/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
Modules/Core/Common/include/otbStringToHTML.h 2 additions, 0 deletions

Modules/Core/Common/include/otbStringToHTML.h
Packaging/install_java_bindings.cmake 1 addition, 1 deletion

Packaging/install_java_bindings.cmake

with 4 additions and 2 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