projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6594d52 dea40e5)
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)
Conflicts:
modules/video/doc/motion_analysis_and_object_tracking.rst

1  2 
modules/video/src/tvl1flow.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/video/src/tvl1flow.cpp
Simple merge
Domain: Multimedia / Media Vision;