From: Ernest Galbrun <ernest.galbrun@univ-lorraine.fr>
Date: Sun, 17 Aug 2014 20:08:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3002^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fae69df9a95e30f47ca0c358f12fe35fc7ce981e;p=platform%2Fupstream%2Fopencv.git

Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle

Conflicts:
	modules/video/doc/motion_analysis_and_object_tracking.rst
---

fae69df9a95e30f47ca0c358f12fe35fc7ce981e