Merge pull request #9799 from alalek:ocl_program
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:43:46 +0000 (12:43 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:43:46 +0000 (12:43 +0000)
1  2 
modules/core/src/ocl.cpp

Simple merge