Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Dec 2013 14:55:47 +0000 (18:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 2 Dec 2013 14:55:47 +0000 (18:55 +0400)
1  2 
modules/ocl/src/cl_context.cpp

Simple merge