Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
..
2013-08-21 18:59:25 +04:00
2013-08-27 13:26:44 +04:00
2013-08-21 18:59:25 +04:00
2014-02-19 14:33:58 +04:00
2014-02-25 15:02:24 +04:00
2013-12-23 18:50:17 +04:00
2010-05-11 17:44:00 +00:00
2011-06-23 12:15:35 +00:00
2013-09-02 14:00:44 +04:00
2011-07-08 14:34:03 +00:00
2013-08-27 13:26:44 +04:00
2014-01-27 15:28:14 +04:00
2014-02-25 15:02:24 +04:00
2012-10-17 15:57:49 +04:00
2010-05-11 17:44:00 +00:00
2013-09-26 19:02:35 +04:00
2013-04-12 19:37:40 +04:00
2013-11-25 10:53:03 +01:00
2013-08-30 09:49:24 -04:00
2012-04-03 00:33:33 +00:00
2010-05-11 17:44:00 +00:00
2011-04-03 10:16:28 +00:00
2010-12-03 22:55:08 +00:00
2010-05-11 17:44:00 +00:00
2013-08-21 18:59:24 +04:00
2013-04-11 18:37:23 +04:00
2010-12-13 15:00:35 +00:00
2013-04-11 18:37:23 +04:00