Maksim Shabunin 3cb76d5c66 Merge pull request #5663 from bertmsk:patch-1		2015-11-20 15:28:26 +00:00
..
doc	Update cuda.markdown	2015-06-02 14:34:15 +01:00
include/opencv2	Merge pull request #5665 from paroj:matx_norm	2015-11-20 15:26:39 +00:00
misc/java	Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)	2015-05-19 13:30:18 +03:00
perf	UMat: add perf test for custom ptr	2015-09-03 10:48:07 +03:00
src	Update system.cpp	2015-11-13 11:03:34 +03:00
test	Merge pull request #5340 from alalek:ocl_off	2015-11-10 16:53:36 +00:00
CMakeLists.txt	fallback path & sample timing implemented	2015-09-04 02:42:49 +03:00