Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: .gitignore doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst modules/gpu/src/match_template.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_precomp.hpp		2013-09-10 11:30:19 +04:00
..
data
_coverage.py
_doc.py
asift.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
browse.py
calibrate.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
camshift.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
coherence.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
color_histogram.py
common.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
contours.py
deconvolution.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
demo.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
dft.py	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
digits_adjust.py
digits_video.py
digits.py
distrans.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
edge.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
facedetect.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
facerec_demo.py	Bugfix 3115: Added not to documentation for python version for	2013-09-02 11:59:35 +02:00
feature_homography.py
find_obj.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
fitline.py
floodfill.py
gabor_threads.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
gaussian_mix.py
grabcut.py	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
hist.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
houghcircles.py	War on Whitespace, master edition: tabs.	2013-08-27 17:13:53 +04:00
houghlines.py
inpaint.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
kmeans.py
lappyr.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
letter_recog.py
lk_homography.py
lk_track.py
morphology.py	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
mosse.py
motempl.py
mouse_and_match.py
mser.py
opt_flow.py	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
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	Fixed typo	2013-05-05 16:17:41 +04:00
watershed.py