Merge pull request #2096 from kamjagin:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 31 Dec 2013 07:53:24 +0000 (11:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 31 Dec 2013 07:53:25 +0000 (11:53 +0400)
commitcd576c73643a1574dff32b45b420533953f74581
tree9b8b74d2bbe6ffde5128d533ccbcb86ebfeddcf4
parent2d5723ccca0336cea2fbe7bf30e85ca758af29f1
parent3f0765523113ae7fc1b300f27dd78c642bb2b6c7
Merge pull request #2096 from kamjagin:master