Merge pull request #2228 from ilya-lavrenov:tapi_experiments
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 31 Jan 2014 15:14:18 +0000 (19:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 15:14:19 +0000 (19:14 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge