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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
feature_detection.rst	updated documentation	2013-07-17 11:39:58 +04:00
gpuimgproc.rst	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00
histogram.rst	updated documentation	2013-07-17 11:39:58 +04:00
hough.rst	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
imgproc.rst	updated documentation	2013-07-17 11:39:58 +04:00