Vadim Pisarevsky 0b3d13645f Merge pull request #8364 from csukuangfj:patch-2		2017-03-22 14:13:13 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Merge pull request #8404 from khnaba:stream-with-custom-allocator	2017-03-21 20:06:56 +00:00
misc/java	Added Java wrapping for tracking module	2016-12-31 02:19:38 +09:00
perf	test: fix tolerance perf check for Exp/Log/Sqrt	2016-10-20 16:54:48 +03:00
src	Merge pull request #8364 from csukuangfj:patch-2	2017-03-22 14:13:13 +00:00
test	core: add single DMatch/Keypoint I/O	2017-03-03 13:58:55 +03:00
CMakeLists.txt	cmake: fix order of MKL libraries, don't pass additional libraries as modules	2017-02-15 17:13:13 +03:00