Merge pull request #4155 from MSOpenTech:highgui_contrib
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)
commitd0c43f16e03ed99b7bb0e792e8ab38bfefc0947a
tree2a411ac62c2337725fea1e534ef1fc7c59097a44
parentfb4698e7fdfde5f2cc0e2d5c858ee586249ec53c
parentccdd1126f65a2b5abdc1203203f0c1f1ea91e4bc
Merge pull request #4155 from MSOpenTech:highgui_contrib