Merge pull request #1045 from bitwangyaoyao:2.4_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Jun 2013 12:55:06 +0000 (16:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Jun 2013 12:55:06 +0000 (16:55 +0400)
commitbf6b119a3fc6ec1e67fc7e8219bebb405f1be3be
tree7aa9e8a95d9ff8a95e958a74c0d1b328482f059f
parent1cfe5aa41e9787679f8a59df47e169ff0bbe3269
parent2ec1140b25098421915bc7781e2498c4858810c6
Merge pull request #1045 from bitwangyaoyao:2.4_fix