-
https://github.com/itseez/opencv_contribAlexander Shishkov authored
Conflicts: modules/ximgproc/CMakeLists.txt modules/ximgproc/test/test_main.cpp modules/ximgproc/test/test_precomp.hpp
66b6cefd
Conflicts: modules/ximgproc/CMakeLists.txt modules/ximgproc/test/test_main.cpp modules/ximgproc/test/test_precomp.hpp