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

Conflicts:
	modules/photo/doc/inpainting.rst

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

..

denoising.rst

python docs for non-local means denoising

2013-07-13 16:00:15 +05:30

inpainting.rst

Merge branch 'master' into merge-2.4

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

photo.rst

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +04:00