opencv/doc/tutorials
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
bioinspired Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +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-12-03 17:35:21 +04:00
definitions Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-16 15:02:12 +04:00
features2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +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 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
introduction Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
ios Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
ml War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
objdetect Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
photo Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
video fixing trailing whitespaces 2013-09-01 22:38:21 +02:00
viz Update widget_pose.rst 2013-11-15 04:36:22 +03:00
tutorials.rst Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00