Merge pull request #2463 from ziyangli:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 12 Mar 2014 14:51:40 +0000 (18:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Mar 2014 14:51:41 +0000 (18:51 +0400)
commitfd8f2c8d238fb75f674f075e3c0909eae3a206d6
treee18fb1c2a2a30f1a0d0ea67f3a01e44a29ae2717
parent290b93422c80ecda73b1f05e82683a622e5e0aac
parentbbe8654c3d9c0c01d8d6ecd836cc27b93aa65245
Merge pull request #2463 from ziyangli:master