projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 969c55d 6d34d6b)
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)

Trivial merge
Domain: Multimedia / Media Vision;