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)
commitba9bc2d72fc26b8d9267848b5667c70ccde2a2a3
treebd7a303413d5f43dd1f997c65f22e552b8607a09
parentb009e8d0fb907beb0d966e4b25f33f688cce9727
parent8340e31f1f529367417bb84da764e902af604815
Merge pull request #3409 from fish2000:patch-1
modules/highgui/src/window_cocoa.mm