Merge pull request #2226 from ilya-lavrenov:tapi_calcHist
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 30 Jan 2014 13:28:43 +0000 (17:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 Jan 2014 13:28:43 +0000 (17:28 +0400)

Trivial merge