Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
..
2012-10-17 21:42:09 +04:00
2013-04-12 19:37:40 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2012-10-17 15:57:49 +04:00
2010-06-10 07:59:18 +00:00
2010-10-16 07:10:46 +00:00
2010-10-09 11:36:06 +00:00
2012-11-09 10:15:48 +04:00
2012-06-20 16:03:03 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2012-10-17 15:57:49 +04:00
2013-04-12 14:37:01 +04:00
2013-04-11 17:38:33 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-11-27 23:15:16 +00:00
2011-04-25 21:51:36 +00:00
2013-05-13 18:33:20 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-04-11 17:38:33 +04:00
2013-03-20 17:56:06 +04:00
2013-08-14 23:36:29 +10:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-06-02 05:19:09 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2013-04-01 15:24:34 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00