Merge branch 'master' of https://github.com/edgarriba/opencv
authoredgarriba <edgar.riba@gmail.com>
Tue, 7 Oct 2014 07:10:44 +0000 (09:10 +0200)
committeredgarriba <edgar.riba@gmail.com>
Tue, 7 Oct 2014 07:10:44 +0000 (09:10 +0200)
commit9698cc93d97154c100b3c852dde42d82957b662c
tree3287af067affaf0b7456310f79fa59a2c600d599
parent88aed15ffaa6749737d3d40034c2488114581c16
parent022ec106f0fc8689e059726c8a32a5720203a810
Merge branch 'master' of https://github.com/edgarriba/opencv