Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
doc	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
include/opencv2	Move C API of opencv_video to separate file	2013-04-11 17:38:33 +04:00
perf	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
src	Remove HAVE_CVCONFIG_H - it's always defined.	2013-07-10 16:02:07 +04:00
test	Move C API of opencv_video to separate file	2013-04-11 17:38:33 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00