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_emknearestkmeans.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_gbttest.cpp

Warning fixes continued

2012-06-09 15:00:04 +00:00

test_main.cpp

reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.

2011-02-09 20:55:11 +00:00

test_mltests2.cpp

Move C++ basic structures to separate header and inverse dependency from C API

2013-04-01 15:24:32 +04:00

test_mltests.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +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_save_load.cpp

fixed buffer size and restored the use of compressed files in ml's load_save tests.

2013-03-22 01:53:41 +04:00