Merge pull request #1152 from StevenPuttemans:bugfix_2795
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 08:52:47 +0000 (12:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 08:52:48 +0000 (12:52 +0400)
1  2 
modules/highgui/src/cap_qtkit.mm

Simple merge