Merge branch 'master' into master
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Sun, 26 Feb 2017 04:46:59 +0000 (07:46 +0300)
committerGitHub <noreply@github.com>
Sun, 26 Feb 2017 04:46:59 +0000 (07:46 +0300)
commit0d7666a0122a4e625fd9f03b4023f1698234812c
tree4c170e597f0a5c43263f8143c6e41e1530056ad5
parent89a0a46a69499c84784d4fe4d1120e489d3bea9a
parentdcbed8d676a4f0879fc25c31aeaf22bd738f2c63
Merge branch 'master' into master
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/connectedcomponents.cpp