Merge pull request #2903 from mmaraya:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 11 Jul 2014 14:15:59 +0000 (14:15 +0000)
committerRoman Donchenko <roman.donchenko@itseez.com>
Fri, 11 Jul 2014 14:15:59 +0000 (14:15 +0000)
1  2 
modules/highgui/src/window_cocoa.mm

Simple merge