Alexander Alekhin 43eba3d750 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-07-04 18:44:13 +03:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-26 20:19:04 +00:00
misc	videoio(gstreamer): port changes from 14834	2019-06-21 14:42:58 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-07-04 18:44:13 +03:00
CMakeLists.txt	ts: added findDataFile() utility function and SkipTestException	2016-11-29 23:17:39 +03:00