Merge pull request #10263 from mshabunin:embedded-build
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 11 Dec 2017 12:42:45 +0000 (12:42 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 11 Dec 2017 12:42:45 +0000 (12:42 +0000)
1  2 
modules/core/src/ocl.cpp

Simple merge