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
..
ts	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00
ts.hpp	core/ocl: temporary move device selection from ocl module	2013-12-25 16:17:40 +04:00