Merge branch 'master' of git://code.opencv.org/opencv
authorOleg Sklyarov <oleg.sklyarov@itseez.com>
Wed, 10 Oct 2012 13:05:29 +0000 (17:05 +0400)
committerOleg Sklyarov <oleg.sklyarov@itseez.com>
Wed, 10 Oct 2012 13:05:29 +0000 (17:05 +0400)
commit2f4e8ee73e2edbde5d52b00a5e2eca1eb6828a92
tree22c7a7f56d16194366e08ee446245206bc529717
parent3f61b9792b1d2dbffbe58ef288f4e15369551c34
parenta008d6fc17bf13d3b9724794cdb5da7791c3cbea
Merge branch 'master' of git://code.opencv.org/opencv