opencv

Files

Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp

2014-02-17 15:24:05 +04:00

15-puzzle

Feature #2893 Create Java sample without layout.xml implemented.

2013-04-10 13:38:59 +04:00

camera-calibration

Adjusted the camera calibration sample to master API.

2013-08-13 14:55:27 +04:00

color-blob-detection

Merge commit '43aec5ad' into merge-2.4

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

face-detection

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