Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
..
2012-09-03 17:03:31 +04:00
2012-10-17 21:42:09 +04:00
2013-11-19 16:21:09 +04:00
2012-03-11 09:31:28 +00:00
2013-09-30 14:39:17 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2010-11-30 10:09:08 +00:00
2013-11-19 16:21:09 +04:00
2013-09-06 15:44:44 +04:00
2013-11-17 20:34:50 +01:00
2012-03-27 12:00:22 +00:00
2013-04-08 15:47:29 +04:00
2013-11-17 20:34:50 +01:00
2011-06-30 12:06:26 +00:00
2013-08-27 13:26:44 +04:00
2013-11-17 20:34:50 +01:00
2013-11-17 20:34:50 +01:00
2013-11-17 20:34:50 +01:00
2013-10-15 20:08:52 +04:00
2013-03-20 17:56:06 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-04-03 11:55:19 +04:00
2013-09-06 15:44:44 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2013-09-06 15:44:44 +04:00
2013-03-20 17:56:06 +04:00
2013-08-27 13:26:44 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2013-11-17 20:34:50 +01:00
2013-11-19 16:21:09 +04:00
2013-09-06 15:44:44 +04:00
2012-06-12 22:49:14 +00:00
2013-04-12 19:37:40 +04:00
2013-11-17 20:34:50 +01:00
2010-06-11 09:46:43 +00:00
2013-11-17 20:34:50 +01:00
2012-10-17 15:57:49 +04:00
2013-04-08 15:47:29 +04:00
2013-07-03 19:53:21 +04:00
2010-11-27 23:15:16 +00:00
2011-10-06 12:37:53 +00:00
2013-11-19 16:21:09 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2013-11-17 20:34:50 +01:00
2013-10-15 20:08:52 +04:00
2013-04-11 17:38:33 +04:00
2013-08-27 17:13:53 +04:00
2013-11-17 20:34:50 +01:00
2012-06-07 17:21:29 +00:00
2013-04-08 15:47:29 +04:00
2013-04-21 23:04:54 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-10-01 15:57:33 +04:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-30 10:09:08 +00:00
2013-04-01 15:24:32 +04:00
2010-11-27 23:15:16 +00:00
2013-09-06 15:44:44 +04:00
2013-11-17 20:34:50 +01:00
2010-11-30 01:34:39 +00:00
2010-11-30 01:34:39 +00:00
2013-04-16 12:00:02 +04:00
2013-09-30 14:30:01 +04:00
2013-04-08 15:47:29 +04:00
2013-09-06 15:44:44 +04:00
2013-11-17 20:34:50 +01:00
2011-08-15 13:18:01 +00:00
2013-11-17 20:34:50 +01:00
2013-11-19 16:21:09 +04:00
2013-08-21 18:59:25 +04:00
2013-11-19 16:21:09 +04:00
2013-11-19 16:21:09 +04:00
2013-04-08 15:47:29 +04:00
2013-11-17 20:34:50 +01:00
2013-04-12 14:37:01 +04:00
2013-11-17 20:34:50 +01:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2013-11-19 16:21:09 +04:00
2013-08-27 13:26:44 +04:00
2013-11-17 20:34:50 +01:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2010-11-27 23:15:16 +00:00
2013-09-27 19:19:45 +02:00
2013-09-27 19:19:45 +02:00
2013-09-27 19:19:45 +02:00
2013-09-27 19:19:45 +02:00
2013-09-27 19:19:45 +02:00
2013-09-27 19:19:45 +02:00
2013-11-19 16:21:09 +04:00
2013-04-11 21:00:17 +04:00
2013-10-08 12:46:43 +04:00
2013-09-30 14:39:17 +04:00
2013-03-20 17:56:06 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-08-27 13:57:24 +04:00
2013-11-17 20:34:50 +01:00
2010-11-29 13:31:52 +00:00
2013-04-12 19:37:40 +04:00
2013-09-06 15:44:44 +04:00
2013-08-27 13:26:44 +04:00
2010-11-27 23:15:16 +00:00
2012-09-10 16:49:40 +04:00
2013-10-08 12:46:43 +04:00
2013-09-27 19:19:45 +02:00
2013-09-06 12:31:49 +02:00
2013-09-06 12:31:49 +02:00
2011-06-30 12:06:26 +00:00
2011-06-30 12:06:26 +00:00
2013-03-20 17:56:06 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2013-09-06 15:44:44 +04:00
2013-11-17 20:34:50 +01:00