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
..
2012-09-04 17:44:23 +04:00
2012-09-02 20:44:09 +04:00
2012-08-19 19:36:43 +04:00
2012-09-04 17:44:23 +04:00
2012-09-04 08:51:08 +08:00
2012-08-13 21:22:06 +04:00
2012-02-03 11:26:49 +00:00