Alexander Alekhin 318cba4ce3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-11-19 19:48:49 +00:00
..
java/test	java(test): fix test names	2018-01-12 19:14:00 +00:00
plugin_ffmpeg	cmake: fix pkg-config handling	2019-04-26 18:19:03 +03:00
plugin_gstreamer	cmake: fix pkg-config handling	2019-04-26 18:19:03 +03:00
python	python: force using of ArgInfo	2019-11-15 19:16:22 +03:00
build_plugins.sh	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-19 15:43:58 +03:00
gen_dict.json	videoio: do not mix CV_CAP and CAP_ APIs enum values	2017-06-25 23:35:33 +03:00