Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ... Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVLegacyOptions.cmake modules/contrib/src/retina.cpp modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/video.rst modules/gpu/src/speckle_filtering.cpp modules/python/src2/cv2.cv.hpp modules/python/test/test2.py samples/python/watershed.py		2013-08-27 13:26:44 +04:00
..
test_bruteforcematcher.cpp	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
test_em.cpp	All tests writing temporary files are updated to use cv::tempfile() function	2012-06-25 11:24:06 +00:00
test_main.cpp	lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.	2012-03-15 14:36:01 +00:00
test_nearestneighbors.cpp	Normalize line endings and whitespace	2012-10-17 15:32:23 +04:00
test_optflow.cpp	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
test_precomp.hpp	Move non-CV functionality from core.hpp to separate utility.hpp header	2013-03-20 17:56:06 +04:00
test_pyrsegmentation.cpp	Move cv::Rect_	2013-04-01 15:24:33 +04:00
test_stereomatching.cpp	All modules (except ocl and gpu) compiles and pass tests	2013-03-22 22:14:26 +04:00
test_subdivisions.cpp	Normalized file endings.	2013-08-21 18:59:25 +04:00