Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
authorLaurentBerger <laurent.berger@univ-lemans.fr>
Sat, 28 Jan 2017 10:25:11 +0000 (11:25 +0100)
committerLaurentBerger <laurent.berger@univ-lemans.fr>
Sat, 28 Jan 2017 10:25:11 +0000 (11:25 +0100)
1  2 
modules/imgproc/include/opencv2/imgproc.hpp