Merge pull request #2621 from arkunze:pullreq/140319-resize-b

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Tue, 15 Apr 2014 15:56:55 +0000 (19:56 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 15 Apr 2014 15:56:56 +0000 (19:56 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 15 Apr 2014 15:56:55 +0000 (19:56 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 15 Apr 2014 15:56:56 +0000 (19:56 +0400)
diff --cc modules/core/include/opencv2/core/ocl.hpp
Simple merge
diff --cc modules/core/src/ocl.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Tue, 15 Apr 2014 15:56:55 +0000 (19:56 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 15 Apr 2014 15:56:56 +0000 (19:56 +0400)
		1	2
modules/core/include/opencv2/core/ocl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/src/ocl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history