Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Sun, 17 Aug 2014 20:08:12 +0000 (22:08 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Sun, 17 Aug 2014 20:08:12 +0000 (22:08 +0200)
commitfae69df9a95e30f47ca0c358f12fe35fc7ce981e
tree2ee0d6d3dc96b6c4c6008e5bc3850b130ccd735b
parent6594d52185b95e6b87e7de03cdbb7253c8f7a027
parentdea40e5e99c05a9c627f88d2495ae3cb62257296
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle

Conflicts:
modules/video/doc/motion_analysis_and_object_tracking.rst
modules/video/src/tvl1flow.cpp