Merge pull request #2217 from ilya-lavrenov:tapi_superres
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:38:59 +0000 (14:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 10:38:59 +0000 (14:38 +0400)
commit0fef7f8b963c4006d04200549152bccdbdf40c3f
tree89315a71a28d137e37f38e3ec834963963bcec81
parent13875b5fbc0284fb1d239bc3ab03f8a7f0802d2b
parent6ad4823f0c421fd3458817d347b8af10867a587a
Merge pull request #2217 from ilya-lavrenov:tapi_superres
modules/core/include/opencv2/core/opencl/ocl_defs.hpp