Merge branch 'master' of https://github.com/f-morozov/opencv
authorAlexander Shishkov <alexander.shishkov@itseez.com>
Thu, 18 Jul 2013 21:08:49 +0000 (01:08 +0400)
committerAlexander Shishkov <alexander.shishkov@itseez.com>
Thu, 18 Jul 2013 21:08:49 +0000 (01:08 +0400)
commit919f35644e48b33228166cd4969b24a45807eed6
tree60d7ccb36c81495612ef1a8ed3e1f1040ef2628d
parent35a39c19a3456c35d4e69041c4486c11bbc0c987
parentec668ce3a7a80dac91e420e94f05b65e2b86373f
Merge branch 'master' of https://github.com/f-morozov/opencv