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
..
2012-08-30 00:23:45 +04:00
2014-01-27 15:28:14 +04:00
2012-08-30 00:23:45 +04:00
2012-02-29 15:01:28 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2010-07-16 12:54:53 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-08-30 00:23:45 +04:00
2012-10-17 15:32:23 +04:00