Merge pull request #7866 from alalek:update_waitKey
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 16 Dec 2016 12:25:11 +0000 (12:25 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 16 Dec 2016 12:25:11 +0000 (12:25 +0000)
commit75eeb25c1ed0fdd3c915858431b236bbdbf4fc15
treeb4e78c8e55ceafb69c592e4101564b10541e2d71
parent969c55da58f78cb06b0c81b498064b110eb5020e
parent6d34d6b47e5092ca3e552ca90d63ca0e62cdc210
Merge pull request #7866 from alalek:update_waitKey