Merge pull request #921 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 29 May 2013 12:24:49 +0000 (16:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 29 May 2013 12:24:49 +0000 (16:24 +0400)
commitd81d3fc83028fe5340002770f025e4406de6933b
tree6ed8fb95486cf8ead0711ed7bf150718a4d60f3d
parent56121d01ea759f9f4dd89ed4a8f42d8816b04300
parent5ac3b8d5d82fbeebd76cdd75433fabc9f56eff5b
Merge pull request #921 from SpecLad:merge-2.4