Merge pull request #2810 from ilya-lavrenov:tapi_copytomask

author Alexander Alekhin <alexander.alekhin@itseez.com>

Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Wed, 4 Jun 2014 08:23:36 +0000 (12:23 +0400)
author Alexander Alekhin <alexander.alekhin@itseez.com>
Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Jun 2014 08:23:36 +0000 (12:23 +0400)
diff --cc modules/core/src/opencl/copyset.cl
Simple merge
diff --cc modules/core/src/umatrix.cpp
Simple merge
author	Alexander Alekhin <alexander.alekhin@itseez.com>
	Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Wed, 4 Jun 2014 08:23:36 +0000 (12:23 +0400)
		1	2
modules/core/src/opencl/copyset.cl	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/src/umatrix.cpp	patch \|	diff1 \|	diff2 \|	blob \| history