Merge branch 'master' of code.opencv.org:opencv
authorAlexander Mordvintesv <zzznah@gmail.com>
Wed, 22 Aug 2012 13:43:48 +0000 (16:43 +0300)
committerAlexander Mordvintesv <zzznah@gmail.com>
Wed, 22 Aug 2012 13:43:48 +0000 (16:43 +0300)
commit4fb15ae1f09ee1c2ec8f55418b7470ce4e496f7e
tree0184ef4ab562ca42ab967122a647ace430c0673c
parentd9185ec21b42198b55b97bef119a9621da34258a
parentbbf679267ae1ffdd4bdedb5497a8e03ed059678b
Merge branch 'master' of code.opencv.org:opencv