Merge pull request #2310 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Feb 2014 09:44:51 +0000 (13:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Feb 2014 09:44:51 +0000 (13:44 +0400)
commit7a35f4593ed39922e016302bb05560a56631892d
treeae75c64db207b085b1832f2320b39ffc897eed36
parent86b6c48712df872df9ebc917aaebf0f8446171f4
parent72aabb8a8419c4fff0372ce3ac852b9b22e40b87
Merge pull request #2310 from SpecLad:merge-2.4