Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp

2013-09-10 11:30:19 +04:00

..

main.cpp

OCL: tests: repair/disable failed tests in ocl module

2013-08-22 17:06:47 +04:00

test_arithm.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_bgfg.cpp

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

2013-09-10 11:30:19 +04:00

test_blend.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_brute_force_matcher.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_calib3d.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_canny.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_color.cpp

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

2013-08-19 19:02:36 +04:00

test_fft.cpp

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

2013-08-19 19:02:36 +04:00

test_filters.cpp

add adaptive bilateral filter (cpp and ocl version)

2013-08-29 10:48:15 +08:00

test_gemm.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_hough.cpp

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

2013-08-19 19:02:36 +04:00

test_imgproc.cpp

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

2013-09-10 11:30:19 +04:00

test_kmeans.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_match_template.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_matrix_operation.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_moments.cpp

OCL: tests: repair moments implementation in master branch, enable tests

2013-08-22 23:37:06 +04:00

test_norm.cpp

added a test for ocl::norm

2013-08-22 17:37:48 +04:00

test_objdetect.cpp

OCL: tests: repair/disable failed tests in ocl module

2013-08-22 17:06:47 +04:00

test_optflow.cpp

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

2013-09-10 11:30:19 +04:00

test_precomp.hpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_pyramids.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_sort.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_split_merge.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

utility.cpp

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

2013-09-10 11:30:19 +04:00

utility.hpp

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

2013-09-10 11:30:19 +04:00