Merge pull request #2868 from neo008:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)
commitcb69a5c29a0f229df7e942b680e6db600b7ca153
tree2bb02decaec69fb6ce4245ada94cbfa2d3ea1ccf
parent75742fcd01a7dc96a4f094883fd92a272def4846
parentb6e25a9fc7b6fe511be1cd6f47ca2b45bbb51658
Merge pull request #2868 from neo008:2.4