Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
authorLaurentBerger <laurent.berger@univ-lemans.fr>
Mon, 9 Jan 2017 09:38:08 +0000 (10:38 +0100)
committerLaurentBerger <laurent.berger@univ-lemans.fr>
Mon, 9 Jan 2017 09:38:08 +0000 (10:38 +0100)
commit5e08d588f8bf7bf9a8690694212cd1f37bfcb060
tree8e3eba4643903fc333a932f948bc11bf501b4998
parenta2f3692bffdaa9b48983555bcb2136657defdc6e
parent45f0cf0d41170398d44612f69b574bae23f57e2f
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
modules/imgproc/include/opencv2/imgproc.hpp