Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp

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

..

main.cpp

update

2013-11-07 17:21:56 +04:00

perf_arithm.cpp

added ocl::repeat

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

perf_bgfg.cpp

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

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

perf_blend.cpp

fixed and generalized ocl::blendLinear

2013-10-28 23:56:40 +04:00

perf_brute_force_matcher.cpp

Merge pull request #1687 from bitwangyaoyao:2.4_fix

2013-10-29 11:03:34 +04:00

perf_calib3d.cpp

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

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

perf_canny.cpp

fixing typo

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

perf_color.cpp

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

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

perf_fft.cpp

fixing typo

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

perf_filters.cpp

fixing typo

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

perf_gemm.cpp

fixing typo

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

perf_gftt.cpp

fixing typo

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

perf_haar.cpp

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

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

perf_hog.cpp

fixing typo

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

perf_hough.cpp

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

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

perf_imgproc.cpp

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

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

perf_kalman.cpp

fixing typo

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

perf_match_template.cpp

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

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

perf_matrix_operation.cpp

disabled upload and download perf tests

2013-10-30 17:08:57 +04:00

perf_ml.cpp

fixing typo

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

perf_moments.cpp

fixed ocl::Moments test

2013-11-01 00:09:11 +04:00

perf_norm.cpp

fixing typo

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

perf_opticalflow.cpp

fixing typo

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

perf_precomp.hpp

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

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

perf_pyramid.cpp

fixing typo

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

perf_split_merge.cpp

fixing typo

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