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
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
misc	ts: run.py passthrough --test_* args "as is"	2018-05-22 13:40:09 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
CMakeLists.txt	ts: added findDataFile() utility function and SkipTestException	2016-11-29 23:17:39 +03:00