Alexander Alekhin 2ad0487cec Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-08-13 18:32:29 +00:00
..
cmake	ffmpeg: win32 wrapper update	2019-06-16 16:20:40 +00:00
doc	pre: OpenCV 4.1.1 (version++)	2019-06-21 19:18:50 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +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-08-13 18:32:29 +00: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