From: LaurentBerger <laurent.berger@univ-lemans.fr>
Date: Sat, 28 Jan 2017 10:25:11 +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^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48e2d38be70c8503111a23d440f4d716a7dbf891;p=platform%2Fupstream%2Fopencv.git

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

48e2d38be70c8503111a23d440f4d716a7dbf891