1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-02-20 12:31:16 +04:00
31 changed files with 427 additions and 212 deletions
@@ -531,7 +531,7 @@ StarAdjuster
SurfAdjuster
------------
.. ocv:class:: SurfAdjuster: public AdjusterAdapter
.. ocv:class:: SurfAdjuster : public AdjusterAdapter
:ocv:class:`AdjusterAdapter` for ``SurfFeatureDetector``. ::