• Luc Hermitte's avatar
    Merge branch 'develop' into dev-sar-s1 · 659f0943
    Luc Hermitte authored
    Conflicts fixed:
    	.travis.yml
    	Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
    	Modules/Adapters/OSSIMAdapters/src/otbSensorModelAdapter.cxx
    	Modules/ThirdParty/Boost/otb-module-init.cmake
    	Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
    	Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
    659f0943
.travis.yml 206 Bytes