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)
commitb63a7e66dba32eaf9b53742d79caf24ec2378d49
tree8783e57b090d1fc06cf0db5255dfddcd4f803bb6
parentf773cd9a3e608e04f1e0d3e22d0c5e8482105ffe
parent2e49ca4903175f507e828047a58acabc1010e827
Merge pull request #2953 from gongzg:master
modules/core/src/ocl.cpp