Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 09:56:59 +0000 (09:56 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 09:56:59 +0000 (09:56 +0000)

Trivial merge