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

..

main.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

test_api.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_arithm.cpp

added ocl::repeat

2013-11-05 12:23:20 +04:00

test_bgfg.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

test_blend.cpp

ocl: fix testdata for blendLinear

2013-11-01 14:44:13 +04:00

test_brute_force_matcher.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_calib3d.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_canny.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_color.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-19 16:21:09 +04:00

test_fft.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

test_filters.cpp

Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs

2013-11-06 16:48:50 +04:00

test_gemm.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_hough.cpp

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

test_imgproc.cpp

Make Integral sum support cv_32f, sqsum support cv_64f.

2013-11-11 14:31:02 +08:00

test_kalman.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_kmeans.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

test_match_template.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_matrix_operation.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_mean_shift.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_ml.cpp

Revert "disable SVM when AMD BLAS is not available"

2013-11-05 15:13:30 +04:00

test_moments.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-05 16:38:23 +04:00

test_objdetect.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

test_optflow.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

test_precomp.hpp

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

test_pyramids.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_sort.cpp

fixing typo

2013-10-25 18:00:46 +04:00

test_split_merge.cpp

ocl: split: update tests and implementation

2013-10-30 14:08:37 +04:00

test_warp.cpp

Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear

2013-11-12 12:40:14 +04:00

utility.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-05 16:38:23 +04:00

utility.hpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-05 16:38:23 +04:00