Alexander Alekhin 11b020b9f9 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-06-10 19:05:28 +00:00
..
calib3d	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
core	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
dnn	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
features2d	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
flann	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-03-22 19:31:31 +03:00
gapi	Merge pull request #14513 from TolyaTalamanov:at/color-convert-kernels	2019-06-10 14:09:30 +03:00
highgui	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-19 15:43:58 +03:00
imgcodecs	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
imgproc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
js	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-05-28 18:29:48 +00:00
ml	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
objdetect	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
photo	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
python	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
stitching	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-13 20:00:54 +00:00
ts	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
video	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-10 19:05:28 +00:00
videoio	Allow setting IS_PART_OF_WORLD in command line, fix videoio plugin linking	2019-06-10 14:13:54 +03:00
world	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
CMakeLists.txt