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

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-10-28 13:38:25 +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

Merge pull request #1740 from ilya-lavrenov:ocl_corners

2013-11-06 13:31:44 +04: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

added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)

2013-11-06 23:14:04 +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