Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Kapustin <alexander.kapustin@itseez.com>
Thu, 20 Sep 2012 13:32:54 +0000 (17:32 +0400)
committerAlexander Kapustin <alexander.kapustin@itseez.com>
Thu, 20 Sep 2012 13:32:54 +0000 (17:32 +0400)
commit858f4371623afef8ac0a25f8bce66404a77179cb
treeb95f970c47d3a2b7ab08aaa19ef1df2dc5e53ac4
parent8f4ddad52dbe692e892e0714966c808c4687d23c
parent44e8d76d74f1b936e2f996ee300fab12f03c5765
Merge branch 'master' of git://code.opencv.org/opencv