opencv/samples/gpu/performance
Roman Donchenko bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
..
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
performance.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
performance.h replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
tests.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00