opencv/doc/tutorials
Roman Donchenko 30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
..
bioinspired Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
calib3d Normalized file endings. 2013-08-21 18:59:25 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
definitions Merge branch 'master' into merge-2.4 2013-10-01 17:37:05 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
general/table_of_content_general Normalized file endings. 2013-08-21 18:59:25 +04:00
gpu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +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-09-10 11:30:19 +04:00
introduction Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +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
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 removed trailing spaces 2013-09-18 12:50:55 +01:00
tutorials.rst Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00