MRG: Merge branch 'clean_deprecated' into develop
Conflicts: Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx Modules/Applications/AppClassification/test/CMakeLists.txt Modules/Learning/Supervised/otb-module.cmake
Showing
Conflicts: Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx Modules/Applications/AppClassification/test/CMakeLists.txt Modules/Learning/Supervised/otb-module.cmake