Skip to content
  • Esquis Benjamin's avatar
    Merge branch 'develop' into ci-gpo · 3b474a94
    Esquis Benjamin authored
    Conflicts:
    	CI/maja_build.cmake
    	Code/Core/Applications/Common/vnsAppBinaryThreshold.cxx
    	Code/Core/Applications/Common/vnsAppImageListWriter.cxx
    	Documentation/Conception/rst/index.rst
    	Documentation/UserManual/rst/index.rst
    	Packaging/CMakeLists.txt
    	SuperBuild/patches/GDAL/old/gdal-swig_python_GNUmakefile-linux.diff
    	Testing/TU/orchestrator/LANDSAT8/CMakeLists.txt
    	Testing/TVA/Common/CMakeLists.txt
    	Testing/TVA/OTBApplications/CMakeLists.txt
    	orchestrator/plugins/common/base/maja_l2_image_writer_base.py
    	orchestrator/plugins/common/muscate/maja_muscate_l2_image_writer.py
    	orchestrator/plugins/landsat8/maja_landsat8_l1_image_file_reader.py
    	orchestrator/plugins/sentinel2_muscate/maja_sentinel2_muscate_l1_image_file_reader.py
    	orchestrator/plugins/venus/maja_venus_l1_image_file_reader.py
    	orchestrator/processor/l2_pipelines/cloud_mask_computation.py
    	orchestrator/processor/l2_pipelines/cloud_mask_resampling.py
    	orchestrator/processor/l2_processor.py
    3b474a94