From: LaurentBerger <laurent.berger@univ-lemans.fr>
Date: Mon, 26 Dec 2016 16:03:52 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~983^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2f3692bffdaa9b48983555bcb2136657defdc6e;p=platform%2Fupstream%2Fopencv.git

Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
---

a2f3692bffdaa9b48983555bcb2136657defdc6e