Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
..
2014-03-24 19:02:16 +04:00
2014-03-27 11:21:32 +04:00
2014-03-11 17:20:01 +04:00
2014-03-31 14:42:00 +04:00
2014-02-18 10:45:47 +04:00
2014-03-03 13:45:22 +04:00
2014-03-24 19:02:16 +04:00
2013-12-03 17:35:21 +04:00
2014-03-11 17:20:01 +04:00
2013-12-03 17:35:21 +04:00
2014-03-11 17:20:01 +04:00
2014-02-03 13:23:59 +04:00
2014-02-17 15:24:05 +04:00
2013-12-03 17:35:21 +04:00
2013-12-03 17:35:21 +04:00
2013-11-11 17:02:50 +04:00
2014-03-31 14:42:00 +04:00
2014-03-24 19:02:16 +04:00
2014-03-31 14:42:00 +04:00
2014-03-26 19:04:57 +04:00
2014-03-31 14:42:00 +04:00
2014-03-03 13:45:22 +04:00
2014-03-27 14:58:53 +10:00
2014-02-23 20:21:08 +04:00
2014-03-31 14:42:00 +04:00
2014-03-21 18:24:36 +04:00
2013-10-29 16:14:32 +04:00
2014-03-25 14:37:56 +04:00
2014-02-14 15:40:16 +04:00
2014-02-25 17:33:12 +04:00
2014-01-18 01:31:33 +04:00
2014-02-20 13:09:06 +04:00
2014-03-24 19:02:16 +04:00
2014-03-31 14:42:00 +04:00
2014-03-24 19:02:16 +04:00
2014-03-17 14:14:07 +04:00
2014-03-24 19:02:16 +04:00
2013-11-11 16:55:36 +04:00
2013-06-10 18:18:01 +04:00