Merge pull request #2018 from ilya-lavrenov:tapi_dft
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 19 Dec 2013 12:47:18 +0000 (16:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 19 Dec 2013 12:47:19 +0000 (16:47 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge