Merge pull request #984 from albenoit:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 16 Jul 2013 07:57:51 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 16 Jul 2013 07:57:52 +0000 (11:57 +0400)
commit3443fd85cd02d65fedcef5b29325e4f7545d5664
treefbcafaa7a085b53783ccf8b75da14d96b45149e6
parent52a9378257f5c059f122c6b5c12f91a918c8a1d8
parent12f65c61a8d7341c3151d8c0bf7c5970e19b2cf1
Merge pull request #984 from albenoit:master