Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 29 Oct 2013 06:35:42 +0000 (10:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Oct 2013 06:35:42 +0000 (10:35 +0400)

Trivial merge