Merge pull request #2697 from PhilLab:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 8 May 2014 12:57:49 +0000 (16:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 8 May 2014 12:57:50 +0000 (16:57 +0400)
commiteb240cc2063f8c57f02637f9eeabf355399d3312
treeeff967a8456ba3f260b69841da95a804e358169b
parent72e095b8a5958f760f9d49b6bbe734927cb706f8
parent4ffeb01cfd75b46c83d05ba5aab3afdb5445003e
Merge pull request #2697 from PhilLab:master