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)
1  2 
modules/core/src/ocl.cpp
modules/photo/test/ocl/test_denoising.cpp

Simple merge