Merge pull request #2329 from ilya-lavrenov:macosx_ogl
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 14 Feb 2014 10:38:36 +0000 (14:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Feb 2014 10:38:37 +0000 (14:38 +0400)
commita1de9e9ad59ebf92574110ffe2bd4c546c1810da
tree3acf72342441969ce0aaff7caa8c3bdb93d7a7a0
parentecbe843061f847d98db1e88b04be76ed6f92fb84
parentb92a46c130a0f34f07af64525fb57fd27c841654
Merge pull request #2329 from ilya-lavrenov:macosx_ogl