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

..

perf_batchDistance.cpp

Fix memory corruption in batchDistance perf tests

2012-12-22 21:01:57 +04:00

perf_fast.cpp

Merge commit '43aec5ad' into merge-2.4

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

perf_main.cpp

Added performance tests for cv:phase and cv::SURF

2011-10-07 13:55:26 +00:00

perf_orb.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

perf_precomp.hpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00