Merge pull request #3409 from fish2000:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 19 Nov 2014 16:25:36 +0000 (16:25 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 19 Nov 2014 16:25:36 +0000 (16:25 +0000)
1  2 
modules/highgui/src/window_cocoa.mm

Simple merge