Alexander Alekhin d945aff132 Merge pull request #5371 from Dikay900:ports_to_master		2015-09-21 13:52:45 +00:00
..
doc	Update cuda.markdown	2015-06-02 14:34:15 +01:00
include/opencv2	Merge pull request #5329 from paroj:cliparser	2015-09-21 09:46:54 +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	Fixed minMaxLoc and test functions	2015-09-21 13:44:29 +02:00
test	Merge pull request #5371 from Dikay900:ports_to_master	2015-09-21 13:52:45 +00:00
CMakeLists.txt	fallback path & sample timing implemented	2015-09-04 02:42:49 +03:00