Merge pull request #334 from asmaloney:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 20:45:34 +0000 (00:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 20:45:34 +0000 (00:45 +0400)
commit14c31bfda0a3067249f0e805fff5d86ec85ef071
treedeef2117e9ad3b5488cf006f695fba59ffa5975f
parent94e2b5c140c950275fbff837151fad4c722c0485
parent5d65d000abfcbf7fb96c07b5a93fcff468fe04ef
Merge pull request #334 from asmaloney:2.4