Merge branch 'master' of https://github.com/MicheleCancilla/opencv into parallel_ccomp
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 May 2017 13:51:18 +0000 (16:51 +0300)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 May 2017 13:51:18 +0000 (16:51 +0300)
commitaffb60093d1eb2c72eb3ffa6fa0afcdb114945df
tree0770e4dca8075ceddcf39eae10fed3991f12ebf4
parent4a4d94f26658568cd079fdfe39b79e9bcbc775a7
parent9405c6d2061edc4f8ee1c762a672bbf719c9978a
Merge branch 'master' of https://github.com/MicheleCancilla/opencv into parallel_ccomp
modules/imgproc/include/opencv2/imgproc.hpp
modules/video/src/bgfg_KNN.cpp
modules/video/src/bgfg_gaussmix2.cpp