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
..
2013-09-30 14:39:17 +04:00
2013-12-06 15:20:29 +04:00
2013-08-27 13:26:44 +04:00
2011-10-06 12:37:53 +00:00
2013-04-21 23:04:54 +04:00
2010-11-30 10:09:08 +00:00
2011-08-15 13:18:01 +00:00
2013-12-06 15:20:29 +04:00
2013-08-21 18:59:25 +04:00
2013-10-08 12:46:43 +04:00
2010-11-29 13:31:52 +00:00
2013-10-08 12:46:43 +04:00
2013-11-24 17:10:06 +01:00