Yury Zemlyanskiy 4e0fdf2205 Merge remote-tracking branch 'itseez/opencv' ...

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

2012-09-05 13:40:14 +04:00

..

doc

Small fixes for SimpleFlow algorithm

2012-08-31 14:39:59 +04:00

include/opencv2/video

Small fixes for SimpleFlow algorithm

2012-08-31 14:39:59 +04:00

perf

quiet most of the OSX build warnings

2012-07-05 12:56:31 +00:00

src

Merge remote-tracking branch 'itseez/opencv'

2012-09-05 13:40:14 +04:00

test

fixed build warnings on Windows

2012-08-31 14:56:28 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00