Merge branch '2.4'

Browse Source

...

This commit is contained in:

Andrey Kamaev

2013-02-22 17:33:30 +04:00

parent 0ccdc5b4af e6dd4e840d

commit 0b8a6da817

47 changed files with 669 additions and 376 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

0

samples/gpu/morfology.cpp → samples/gpu/morphology.cpp