Ernest Galbrun fae69df9a9 Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle ...

Conflicts:
	modules/video/doc/motion_analysis_and_object_tracking.rst

2014-08-17 22:08:12 +02:00

..

doc

moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib

2014-08-10 23:24:16 +04:00

include/opencv2

moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib

2014-08-10 23:24:16 +04:00

perf

moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib

2014-08-10 23:24:16 +04:00

src

Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle

2014-08-17 22:08:12 +02:00

test

moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib

2014-08-10 23:24:16 +04:00

CMakeLists.txt

Global CMake reorganization:

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