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

..

opencv

Merge commit '43aec5ad' into merge-2.4

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

opencv2

moved bioinspired to opencv_contrib

2014-01-21 18:02:53 +04:00

CMakeLists.txt

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +04:00