Alexander Alekhin 45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ... Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch" This reverts commit 9ba9358ecb. Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)" This reverts commit f185802489.		2018-06-04 19:26:10 +03:00
..
doc	Add distortion example images for calib3d documentation.	2016-10-09 20:35:58 +02:00
include/opencv2	next(calib3d): eliminate CirclesGridFinderParameters2	2018-04-10 18:09:54 +03:00
misc/java	next(calib3d): eliminate CirclesGridFinderParameters2	2018-04-10 18:09:54 +03:00
perf	avoid calling of setNumThreads() to respect user settings	2018-03-29 13:04:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00