opencv

History

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

.gitignore

Normalized file endings.

2013-08-21 18:59:25 +04:00

android_additional.h

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

arm_linux_stub.cpp

Code review notes fixed;

2013-02-08 12:42:03 +04:00

CMakeLists.txt

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