Merge branch 'master' into merge-2.4

Browse Source

Conflicts:
	modules/photo/doc/inpainting.rst

...

This commit is contained in:

Roman Donchenko

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

parent 339dd983ee 556028eff5

commit 2530b580a8

39 changed files with 2505 additions and 3211 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

modules/imgproc/src/generalized_hough.cpp

+402 -753

File diff suppressed because it is too large Load Diff