Merge remote-tracking branch 'itseez/opencv'
authorYury Zemlyanskiy <yuri.zemlyanskiy@gmail.com>
Wed, 5 Sep 2012 09:40:14 +0000 (13:40 +0400)
committerYury Zemlyanskiy <yuri.zemlyanskiy@gmail.com>
Wed, 5 Sep 2012 09:40:14 +0000 (13:40 +0400)
commit4e0fdf2205dfc75b48cd74dd5de415c685925576
tree2063a28eb2ee4b3484f3a02391a82330ee9e7357
parent0c10ed26e3cf3d336689a538c060359e63a30458
parent5eac0419b2b6e34b1606c1a601074aeaa87f6f4f
Merge remote-tracking branch 'itseez/opencv'

Conflicts:
modules/video/src/simpleflow.cpp
modules/video/test/test_simpleflow.cpp
modules/video/src/simpleflow.cpp