Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 24 Mar 2014 14:46:00 +0000 (18:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 14:46:01 +0000 (18:46 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge