Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

46c5affb

Commit 46c5affb authored 8 years ago by Rashad Kanavath

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into bugfix-1278

parents 286f21b0 eb847909

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CMake/OTBCheckCpp11Keywords.cmake 1 addition, 0 deletions

CMake/OTBCheckCpp11Keywords.cmake
Modules/Adapters/BoostAdapters/include/otb_boost_math_normal_header.h 1 addition, 0 deletions

...ters/BoostAdapters/include/otb_boost_math_normal_header.h
Modules/MPI/MPIConfig/src/otbMPIConfig.cxx 1 addition, 0 deletions

Modules/MPI/MPIConfig/src/otbMPIConfig.cxx
Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h 1 addition, 0 deletions

...s/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
Modules/ThirdParty/MuParserX/CMakeLists.txt 0 additions, 19 deletions

Modules/ThirdParty/MuParserX/CMakeLists.txt
Modules/ThirdParty/MuParserX/src/mpCompat.h.in 18 additions, 5 deletions

Modules/ThirdParty/MuParserX/src/mpCompat.h.in
Modules/Visualization/MonteverdiGui/src/mvdHistogramWidget.cxx 15 additions, 1 deletion

...es/Visualization/MonteverdiGui/src/mvdHistogramWidget.cxx
SuperBuild/CMake/External_boost.cmake 3 additions, 0 deletions

SuperBuild/CMake/External_boost.cmake
SuperBuild/CMake/External_gdal.cmake 1 addition, 0 deletions

SuperBuild/CMake/External_gdal.cmake

with 41 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