Merge pull request #986 from pengx17:2.4_initiated_context
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Jun 2013 12:55:55 +0000 (16:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Jun 2013 12:55:56 +0000 (16:55 +0400)
1  2 
modules/ocl/src/initialization.cpp

Simple merge