Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Dec 2013 08:13:15 +0000 (12:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Dec 2013 08:13:15 +0000 (12:13 +0400)

Trivial merge