Merge pull request #2054 from alalek:ocl_tapi_dev_selection
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 26 Dec 2013 13:27:05 +0000 (17:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Dec 2013 13:27:06 +0000 (17:27 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge