Merge pull request #3170 from ElenaGvozdeva:ocl_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Sep 2014 10:40:02 +0000 (10:40 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Sep 2014 10:40:02 +0000 (10:40 +0000)
1  2 
modules/core/src/ocl.cpp

Simple merge