Roman Donchenko 52a785e95a Merge pull request #1996 from SpecLad:merge-2.4		2013-12-17 13:21:48 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
include/opencv2	Fixed build for the TLS-related stuff.	2013-12-16 18:45:41 +04:00
perf	core/ocl: added perf test infra + "Add" perf test	2013-12-03 18:43:50 +04:00
src	Merge pull request #1996 from SpecLad:merge-2.4	2013-12-17 13:21:48 +04:00
test	implemented UMat::convertTo	2013-12-15 14:15:30 +04:00
CMakeLists.txt	core/ocl: update dynamic runtime	2013-12-11 15:56:54 +04:00