Merge pull request #2696 from PhilLab:2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 5 May 2014 13:08:47 +0000 (17:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 May 2014 13:08:48 +0000 (17:08 +0400)
commitf0d4ccc6cfabb56ec65197cf77e07ad28395beaa
treecc16a1c762a1cf051d9f557b7b13612c7b8977f2
parent5042ab1f32e7d9d728ae2862ad5a4f34b9f7ca17
parent897d0a9aaf4994d915d2ddb8e3e4a21d9c0d102b
Merge pull request #2696 from PhilLab:2.4