Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp		2014-03-31 14:42:00 +04:00
..
data
_coverage.py
_doc.py
asift.py	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04:00
browse.py
calibrate.py
camshift.py
coherence.py
color_histogram.py
common.py
contours.py
deconvolution.py
demo.py
dft.py
digits_adjust.py
digits_video.py
digits.py
distrans.py
edge.py
facedetect.py
facerec_demo.py
feature_homography.py
find_obj.py
fitline.py
floodfill.py
gabor_threads.py
gaussian_mix.py
grabcut.py
hist.py
houghcircles.py
houghlines.py
inpaint.py
kmeans.py
lappyr.py
letter_recog.py
lk_homography.py
lk_track.py
logpolar.py
morphology.py
mosse.py
motempl.py
mouse_and_match.py
mser.py
opt_flow.py
peopledetect.py
plane_ar.py
plane_tracker.py
squares.py
stereo_match.py
texture_flow.py
turing.py
video_dmtx.py
video_threaded.py
video.py
watershed.py