Merge pull request #2494 from ilya-lavrenov:tapi_merge
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 20 Mar 2014 09:39:39 +0000 (13:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 20 Mar 2014 09:39:39 +0000 (13:39 +0400)
commit2299e2ed1bf101b60728db57720440ffe731a75e
tree8acdc6c686147295c02ca4e728c6fd87b9395fc3
parent87ae0f9990c174436a849aa950d8141b72bfe266
parenteb8b4c58c7c717a3c2f03c22e186267c4e44f265
Merge pull request #2494 from ilya-lavrenov:tapi_merge
modules/core/src/ocl.cpp
modules/photo/test/ocl/test_denoising.cpp