Skip to content
Snippets Groups Projects
Commit 5b6a7299 authored by Ludovic Hussonnois's avatar Ludovic Hussonnois
Browse files

MRG: synchronize remote-tracking branch 'remotes/origin/develop' into unsupervised_classif

Conflicts:
      Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
      Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
      Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
      Modules/Learning/LearningBase/include/otbImageClassificationFilter.txx
      Modules/Learning/LearningBase/include/otbMachineLearningModel.h
      Modules/Learning/LearningBase/include/otbMachineLearningModel.txx
      Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
      Modules/Learning/LearningBase/include/otbSharkUtils.h
parents f615fbd3 8b570e91
No related branches found
No related tags found
No related merge requests found
Showing
with 375 additions and 18 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 to comment