opencv/modules/nonfree/perf
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_gpu.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
perf_main.cpp Changed the impls argument to be an array name. 2013-06-20 15:18:35 +04:00
perf_precomp.hpp added cvconfig.hpp header file to gpu tests 2013-08-19 12:46:57 +04:00
perf_surf.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
perf_surf.ocl.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00