Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

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

..

data

added texture_flow.py sample

2012-08-19 20:36:50 +03:00

_coverage.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

_doc.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

asift.py

Merge commit '43aec5ad' into merge-2.4

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

browse.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

calibrate.py

Merge commit '43aec5ad' into merge-2.4

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

camshift.py

Merge commit '43aec5ad' into merge-2.4

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

coherence.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

color_histogram.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

common.py

Merge commit '43aec5ad' into merge-2.4

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

contours.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

deconvolution.py

Merge commit '43aec5ad' into merge-2.4

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

demo.py

Merge commit '43aec5ad' into merge-2.4

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

dft.py

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

digits_adjust.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

digits_video.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

digits.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

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

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

feature_homography.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

find_obj.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

fitline.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

floodfill.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

gabor_threads.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

gaussian_mix.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

grabcut.py

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

hist.py

Merge commit '43aec5ad' into merge-2.4

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

houghcircles.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

houghlines.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

inpaint.py

Merge commit '43aec5ad' into merge-2.4

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

kmeans.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lappyr.py

Merge commit '43aec5ad' into merge-2.4

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

letter_recog.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lk_homography.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lk_track.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

morphology.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

mosse.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

motempl.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

mouse_and_match.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

mser.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

opt_flow.py

Merge commit '43aec5ad' into merge-2.4

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

peopledetect.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

plane_ar.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

plane_tracker.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

squares.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

stereo_match.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

texture_flow.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

turing.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

video_dmtx.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

video_threaded.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

video.py

Fixed typo

2013-05-05 16:17:41 +04:00

watershed.py

Merge branch '2.4'

2013-04-12 15:35:38 +04:00