Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ...

Conflicts:
	modules/photo/doc/inpainting.rst

2013-08-16 14:14:12 +04:00

..

color.rst

…

feature_detection.rst

…

gpuimgproc.rst

…

histogram.rst

…

hough.rst

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

imgproc.rst

…