Merge branch 'master' of https://github.com/es0m/opencv
authorEric Sommerlade <es0m@users.noreply.github.com>
Mon, 31 Oct 2016 11:10:01 +0000 (11:10 +0000)
committerEric Sommerlade <es0m@users.noreply.github.com>
Mon, 31 Oct 2016 11:10:01 +0000 (11:10 +0000)
commit62c28c5b921c9f9e905f5bed20fc0a51b8a60f44
tree496ec5bf4bdc406a44c3294de92c55e7a635772e
parent049a8949865f23cac30b086e129fd5559b846593
parentd00dcb1b3a8f026118df41e625221c65609afb23
Merge branch 'master' of https://github.com/es0m/opencv