Alexander Alekhin 3fb6617d62 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-10-02 17:49:19 +03:00
..
cmake	Merge pull request #15351 from philippefoubert:pr_ximea	2019-08-21 00:01:34 +03:00
doc	videoio(doc): fix 'since' version	2019-08-20 13:15:56 +03:00
include/opencv2	Fix modules/ typos	2019-08-16 17:34:29 +03:00
misc	cmake: fix pkg-config handling	2019-04-26 18:19:03 +03:00
perf	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-10-02 17:49:19 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-08-13 18:32:29 +00:00
CMakeLists.txt	ffmpeg: win32 wrapper update	2019-06-16 16:20:40 +00:00