zio dodo 5f7163bff2 Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial
Conflicts:
	modules/stitching/src/motion_estimators.cpp
2013-08-29 20:12:12 +02:00
..
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00

Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.