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-08-27 14:23:26 +04:00
2014-01-14 11:53:59 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-10-15 20:08:52 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-08-27 14:39:43 +04:00
2010-06-10 07:59:18 +00:00
2010-10-16 07:10:46 +00:00
2010-10-09 11:36:06 +00:00
2014-01-27 15:28:14 +04:00
2012-06-20 16:03:03 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2012-10-17 15:57:49 +04:00
2013-04-12 14:37:01 +04:00
2013-04-11 17:38:33 +04:00
2013-12-09 09:54:42 -02:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-11-27 23:15:16 +00:00
2011-04-25 21:51:36 +00:00
2013-05-13 18:33:20 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-04-11 17:38:33 +04:00
2013-03-20 17:56:06 +04:00
2013-08-14 23:36:29 +10:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-06-02 05:19:09 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2013-04-01 15:24:34 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00