opencv/doc/tutorials
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
..
bioinspired retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Normalized file endings. 2013-08-21 18:59:25 +04:00
core Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
definitions Normalized file endings. 2013-08-21 18:59:25 +04:00
features2d Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
general/table_of_content_general Normalized file endings. 2013-08-21 18:59:25 +04:00
gpu Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
highgui Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
images adding retina tutorial 2012-10-30 15:06:13 +04:00
imgproc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
introduction Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ios Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ml Normalized file endings. 2013-08-21 18:59:25 +04:00
objdetect Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
video/table_of_content_video Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
tutorials.rst updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00