Merge pull request #1748 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 6 Nov 2013 08:55:04 +0000 (12:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 6 Nov 2013 08:55:05 +0000 (12:55 +0400)
commit8b19df3fecd558b9e87275f6620a18f807072a6e
tree65dcf2099bed8ed5607c76899fd95bf649818fe1
parent03bbee327b44c9384f46a042585bc4f0a46d8a26
parent65389e41db2d16f09101f7469f4404935754b0d9
Merge pull request #1748 from SpecLad:merge-2.4