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

Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp

2013-07-16 11:52:41 +04:00

..

main.cpp

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

2013-07-16 11:52:41 +04:00

precomp.cpp

merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)

2012-07-16 17:08:14 +00:00

precomp.hpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_arithm.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_blend.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_brute_force_matcher.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_calib3d.cpp

fixing working with test data and a small fix for init code

2013-07-09 13:25:21 +04:00

test_canny.cpp

fixing working with test data and a small fix for init code

2013-07-09 13:25:21 +04:00

test_color.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_fft.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_filters.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_gemm.cpp

fix the waring in gemm test

2013-05-17 13:19:09 +08:00

test_hough.cpp

Move C API of opencv_calib3d to separate file

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

test_imgproc.cpp

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

2013-07-03 19:53:21 +04:00

test_kmeans.cpp

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

2013-07-16 11:52:41 +04:00

test_match_template.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_matrix_operation.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_moments.cpp

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

2013-07-16 11:52:41 +04:00

test_objdetect.cpp

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

2013-07-16 11:52:41 +04:00

test_optflow.cpp

fixing working with test data and a small fix for init code

2013-07-09 13:25:21 +04:00

test_pyramids.cpp

revise accuracy and perf tests

2013-06-19 13:03:35 +08:00

test_split_merge.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

utility.cpp

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

2013-06-25 15:55:52 +04:00

utility.hpp

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

2013-06-25 15:55:52 +04:00