opencv/doc/tutorials
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
bioinspired War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
calib3d Normalized file endings. 2013-08-21 18:59:25 +04:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-02 19:44:51 +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 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +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 Removed a duplicate line. 2013-08-28 13:13:15 +04:00
ios War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
ml War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +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