Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/src/gl_core_3_1.cpp modules/core/src/opencl/convert.cl modules/cudaimgproc/src/cuda/canny.cu modules/cudastereo/perf/perf_stereo.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/test/test_denoising.cpp modules/ocl/src/opencl/imgproc_resize.cl samples/cpp/Qt_sample/main.cpp		2014-02-17 15:24:05 +04:00
..
config	Move cv::Matx and cv::Vec to separate header	2013-04-01 15:24:33 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-17 15:24:05 +04:00
gen_java.py	fixes for defects from code coverity	2014-01-28 20:24:10 +04:00
gen_javadoc.py	Fixed the shebang lines on the Python scripts.	2013-04-11 18:37:23 +04:00
rst_parser.py	removed ocl from allmodules list	2014-02-01 20:55:50 +04:00