Alexander Alekhin 1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-11-10 20:50:26 +00:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-10 20:50:26 +00:00
misc	Merge pull request #12667 from cv3d:fix/ts_report	2018-09-29 20:03:54 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-10 20:50:26 +00:00
CMakeLists.txt	ts: added findDataFile() utility function and SkipTestException	2016-11-29 23:17:39 +03:00