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

Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp

2013-11-26 15:05:26 +04:00

..

main.cpp

update

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

perf_arithm.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +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-11-26 15:05:26 +04:00

perf_fft.cpp

fixing typo

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

perf_filters.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +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-19 16:21:09 +04:00

perf_imgwarp.cpp

added area fast mode to ocl::resize

2013-11-19 13:43:50 +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-11-19 16:21:09 +04:00

perf_matrix_operation.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17: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-11-19 16:21:09 +04:00

perf_pyramid.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00

perf_split_merge.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00