Merge pull request #2879 from alalek:ocl_runtime_flags
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 4 Aug 2014 16:43:00 +0000 (16:43 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 4 Aug 2014 16:43:01 +0000 (16:43 +0000)
1  2 
modules/core/src/arithm.cpp
modules/core/src/ocl.cpp
modules/core/src/stat.cpp

Simple merge
Simple merge
Simple merge