Merge pull request #969 from pengx17:2.4_binary_cache

author Roman Donchenko <roman.donchenko@itseez.com>

Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)
diff --cc modules/ocl/include/opencv2/ocl/ocl.hpp
Simple merge
diff --cc modules/ocl/src/initialization.cpp
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)
		1	2
modules/ocl/include/opencv2/ocl/ocl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.cpp	patch \|	diff1 \|	diff2 \|	blob \| history