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
..
2014-02-14 23:04:03 +05:30
2013-12-11 13:30:52 +01:00
2013-12-20 16:02:37 +04:00
2013-08-27 22:42:03 +03:00
2013-11-25 10:53:03 +01:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:24 +04:00
2013-08-27 22:42:03 +03:00
2013-08-27 13:26:44 +04:00
2014-02-25 15:02:24 +04:00
2014-02-13 13:52:00 +05:30
2014-02-25 15:02:24 +04:00
2013-12-11 13:28:27 +01:00
2013-11-21 22:36:31 -05:00
2013-08-21 18:59:26 +04:00
2013-11-22 10:41:17 +01:00