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

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-27 15:28:14 +04:00

include/opencv2

Merge pull request #1320 from mbarnach:svm_hog

2014-01-21 19:23:04 +04:00

src

Merge pull request #1320 from mbarnach:svm_hog

2014-01-21 19:23:04 +04:00

test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-20 15:10:19 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00