Merge pull request #1961 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)
commit90c28d254f06127e3bc5e8ad0cdfc3ee8590da16
tree1b156cd51466d78271e17dc5c2fc6ab8b7b33bf0
parent5c72c74b091e06ffe27ac40005227d93ca4ab076
parent464a010f53f833b427c271610e27d840b426522c
Merge pull request #1961 from SpecLad:merge-2.4