Merge pull request #2953 from gongzg:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 19:21:14 +0000 (19:21 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 19:21:15 +0000 (19:21 +0000)
1  2 
modules/core/src/ocl.cpp

Simple merge