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

Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml

2013-08-13 12:56:39 +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

Warning fixes

2013-07-19 14:36:41 +08: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 pull request #1164 from bitwangyaoyao:master_fixHaar

2013-07-30 16:14:24 +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_sort.cpp

Some modifications to sortByKey API.

2013-07-30 11:53:25 +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