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/images	Removed Sphinx documentation files	2014-12-26 19:12:19 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
test	ts: refactor OpenCV tests	2018-02-03 19:39:47 +00:00
CMakeLists.txt	fix doc.	2018-06-03 17:44:24 +08:00