Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

800a787f

Commit 800a787f authored 8 years ago by Rashad Kanavath

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/fix_libsiftfast' into develop

Conflicts:
	CMakeLists.txt

parents d1c3c07a 319f121b

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/Cookbook/rst/index.rst 14 additions, 13 deletions

Documentation/Cookbook/rst/index.rst
Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h 8 additions, 0 deletions

...ng/ImageManipulation/include/otbImageToNoDataMaskFilter.h
Modules/ThirdParty/SiftFast/src/libsiftfast.cpp 16 additions, 15 deletions

Modules/ThirdParty/SiftFast/src/libsiftfast.cpp
README.md 14 additions, 9 deletions

README.md

with 52 additions and 37 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