Merge pull request #1566 from SpecLad:Wshadow-openni
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Oct 2013 11:48:39 +0000 (15:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 7 Oct 2013 11:48:40 +0000 (15:48 +0400)

Trivial merge