Merge pull request #1996 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 17 Dec 2013 09:21:47 +0000 (13:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 09:21:48 +0000 (13:21 +0400)
commit52a785e95a30d9336bfbac97a0a0d0089ffaa7de
tree945157883b23e7a9003177cfe714bf09426baadf
parent0cf76073384f50f2835cb5363bb228eb5d6ab2b7
parentf2befa01f4b1b000e8232ccbfe32acbea16672a1
Merge pull request #1996 from SpecLad:merge-2.4